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 resources/lang/bg/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Кодиране @ Home',
'values' => 'Нашите ценности',
'online_events' => 'Онлайн дейности',
'featured_activities' => 'Подбрани събития ',
'featured_activities' => 'Онлайн дейности',
'codeweek2020' => 'Издание 2020',
'register_activity' => 'Регистриране на Активност',
'select_language' => 'Изберете език',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/cs/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Coding@Home',
'values' => 'Naše hodnoty',
'online_events' => 'Online aktivity',
'featured_activities' => 'Vybrané aktivity',
'featured_activities' => 'Online aktivity',
'codeweek2020' => 'Ročník 2020',
'register_activity' => 'Registruj aktivitu',
'select_language' => 'Vyberte jazyk',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/da/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Kodning@Hjem',
'values' => 'Vores værdier',
'online_events' => 'Online aktiviteter',
'featured_activities' => 'Fremhævede aktiviteter',
'featured_activities' => 'Online aktiviteter',
'codeweek2020' => '2020 udgaven',
'register_activity' => 'Registrer aktivitet',
'select_language' => 'Vælg sprog',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/de/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Programmieren zu Hause',
'values' => 'Unsere Werte',
'online_events' => 'Online-Aktivitäten',
'featured_activities' => 'Hervorgehobene Aktivitäten',
'featured_activities' => 'Online-Aktivitäten',
'codeweek2020' => 'Ausgabe 2020',
'register_activity' => 'Aktivität hinzufügen',
'select_language' => 'Sprache auswählen',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/el/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Κωδικοποίηση@Σπίτι',
'values' => 'Oι αξίες μας',
'online_events' => 'Διαδικτυακές Δραστηριότητες',
'featured_activities' => 'Επιλεγμένες Δραστηριότητες',
'featured_activities' => 'Διαδικτυακές Δραστηριότητες',
'codeweek2020' => 'Διοργάνωση 2020',
'register_activity' => 'Καταχώρηση Δραστηριότητας',
'select_language' => 'Επιλέξτε γλώσσα',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
'coding@home' => 'Coding@Home',
'values' => 'Our values',
'online_events' => 'Online Activities',
'featured_activities' => 'Featured Online Activities',
'featured_activities' => 'Online Activities',
'codeweek2020' => '2020 Edition',
'register_activity' => 'Register activity',
'select_language' => 'Select language',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/fi/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Koodaus@Kotiin',
'values' => 'Meidän arvomme',
'online_events' => 'Online-toiminta',
'featured_activities' => 'Avoimet aktiviteetit',
'featured_activities' => 'Online-toiminta',
'codeweek2020' => 'Versio 2020',
'register_activity' => 'Rekisteröi toiminta',
'select_language' => 'Valitse kieli',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/hr/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodiranje@Kuća',
'values' => 'Naše vrijednosti',
'online_events' => 'Online aktivnosti',
'featured_activities' => 'Planirana događanja',
'featured_activities' => 'Online aktivnosti',
'codeweek2020' => 'Izdanje 2020.',
'register_activity' => 'Registrirajte aktivnost',
'select_language' => 'Odaberite jezik',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/it/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Codifica@Casa',
'values' => 'Nostri valori',
'online_events' => 'Attività online',
'featured_activities' => 'Attività in evidenza',
'featured_activities' => 'Attività online',
'codeweek2020' => 'Edizione 2020',
'register_activity' => "Registra un'attività",
'select_language' => 'Seleziona la lingua',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/lt/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodavimas@Pradžia',
'values' => 'Mūsų principai',
'online_events' => 'Veikla internete',
'featured_activities' => 'Rodoma veikla',
'featured_activities' => 'Veikla internete',
'codeweek2020' => '2020 m. laida',
'register_activity' => 'Užsiregistruoti veiklą',
'select_language' => 'Pasirinkite kalbą',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/lv/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodēšana@Home',
'values' => 'Mūsu vērtības',
'online_events' => 'Tiešsaistes aktivitātes',
'featured_activities' => 'Rodoma veikla',
'featured_activities' => 'Tiešsaistes aktivitātes',
'codeweek2020' => '2020 m. laida',
'register_activity' => 'Reģistrēt aktivitāti',
'select_language' => 'Izvēlieties valodu',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/pl/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodowanie w domu',
'values' => 'Nasze wartości',
'online_events' => 'Aktywności online',
'featured_activities' => 'Polecane zajęcia',
'featured_activities' => 'Aktywności online',
'codeweek2020' => 'Edycja 2020',
'register_activity' => 'Zarejestruj aktywność',
'select_language' => 'Wybierz język',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/ro/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Codare@Acasă',
'values' => 'Valorile noastre',
'online_events' => 'Activități online',
'featured_activities' => 'Activități prevăzute',
'featured_activities' => 'Activități online',
'codeweek2020' => 'Ediția 2020',
'register_activity' => 'Înregistrează o activitate',
'select_language' => 'Selectați limba',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/sk/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kódovanie@Domov',
'values' => 'Naše hodnoty',
'online_events' => 'Online aktivity',
'featured_activities' => 'Vybrané aktivity',
'featured_activities' => 'Online aktivity',
'codeweek2020' => 'Ročník 2020',
'register_activity' => 'Registruj aktivitu',
'select_language' => 'Vyberte jazyk',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/sl/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodiranje@doma',
'values' => 'Naše vrednote',
'online_events' => 'Spletne dejavnosti',
'featured_activities' => 'Izbrane dejavnosti',
'featured_activities' => 'Spletne dejavnosti',
'codeweek2020' => 'Izdaja 2020',
'register_activity' => 'Registrirajte aktivnost',
'select_language' => 'Izberite jezik',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/sv/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
'coding@home' => 'Kodning@Hem',
'values' => 'Våra värderingar',
'online_events' => 'Onlineaktiviteter',
'featured_activities' => 'Utvalda aktiviteter',
'featured_activities' => 'Onlineaktiviteter',
'codeweek2020' => '2020-upplagan',
'register_activity' => 'Registrera aktivitet',
'select_language' => 'Välj språk',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/tr/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
'coding@home' => 'Coding@Home',
'values' => 'Değerlerimiz',
'online_events' => 'Çevrim içi Etkinlikler',
'featured_activities' => 'Öne Çıkan Etkinlikler',
'featured_activities' => 'Çevrim içi Etkinlikler',
'codeweek2020' => '2020 Sürümü',
'register_activity' => 'Etkinlik Kaydet',
'select_language' => 'Dil seçin',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/ua/menu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
'coding@home' => 'Coding@Home',
'values' => 'Наші цінності',
'online_events' => 'Онлайн-заходи',
'featured_activities' => 'Основні заходи',
'featured_activities' => 'Онлайн-заходи',
'codeweek2020' => 'Версія 2020',
'register_activity' => 'Зареєструвати захід',
'select_language' => 'Виберіть мову',
Expand Down
2 changes: 1 addition & 1 deletion resources/views/layout/menu.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class="cookweek-link hover-underline !text-[#1C4DA1] !text-[16px]"
<img src="/images/arrow-right-icon.svg" class="menu-title-icon" />
</li>
<li><a class="cookweek-link hover-underline" href="{{route('events_map')}}">@lang('menu.map')</a></li>
<li><a class="cookweek-link hover-underline" href="{{route('featured_activities')}}">@lang('menu.featured_activities')</a></li>
<li><a class="cookweek-link hover-underline" href="{{route('online_activities')}}">@lang('menu.featured_activities')</a></li>
<li><a class="cookweek-link hover-underline" href="{{route('create_event')}}">@lang('menu.add_event')</a></li>
<li><a class="cookweek-link hover-underline" href="{{route('scoreboard')}}">@lang('event.scoreboard_by_country')</a></li>
<li><a class="cookweek-link hover-underline" href="{{route('guide')}}">@lang('menu.guide_on_activities')</a></li>
Expand Down
8 changes: 4 additions & 4 deletions resources/views/online-calendar/oc-index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
@php
$list = [
(object) ['label' => 'Activities & Events', 'href' => '/add'],
(object) ['label' => 'Featured activities', 'href' => ''],
(object) ['label' => 'Online Activities', 'href' => ''],
];
@endphp
@section('layout.breadcrumb')
@include('layout.breadcrumb', ['list' => $list])
@endsection

@section('title', 'Featured Coding Activities – Join Exciting Code Week Events')
@section('description', 'Discover and participate in featured coding activities from EU Code Week. Find engaging projects and workshops near you!')
@section('title', 'Online Activities – Join Exciting Code Week Events')
@section('description', 'Discover and join upcoming EU Code Week online activities that welcome participants. Filter by language and month to find one that suits you!')

@include('components.tailwind')
@include('components.livewire')
Expand All @@ -27,7 +27,7 @@
<div class="home-activity codeweek-container-lg flex flex-col md:flex-row md:items-center duration-1000 gap-28 md:gap-4 xl:gap-28">
<div class="px-6 py-10 md:px-14 md:py-[4.5rem] bg-white rounded-[32px] z-10 relative">
<h2 class="text-dark-blue text-[30px] md:text-[60px] leading-9 md:leading-[72px] font-normal font-['Montserrat'] mb-4 max-md:max-w-full max-w-[530px]">
Featured activities
Online Activities
</h2>
<p class="text-xl font-normal md:text-2xl leading-8 text-slate-500 p-0 mb-0 max-md:max-w-full max-w-[637px]">
@lang('snippets.featured-activities')
Expand Down
4 changes: 2 additions & 2 deletions resources/views/static/codeweek2020.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<h2>@lang('cw2020.online-activities.title')</h2>
<div>
@lang('cw2020.online-activities.subtitle.0')
<a href="{{route("featured_activities")}}">@lang('cw2020.online-activities.subtitle.1')</a> @lang('cw2020.online-activities.subtitle.2').
<a href="{{route("online_activities")}}">@lang('cw2020.online-activities.subtitle.1')</a> @lang('cw2020.online-activities.subtitle.2').
</div>
<h3>
@lang('cw2020.online-activities.section1.title')
Expand All @@ -51,7 +51,7 @@
</h3>
<div>
@lang('cw2020.online-activities.section3.content.0')
<a href="{{route("featured_activities")}}">@lang('cw2020.online-activities.section3.content.1')</a> @lang('cw2020.online-activities.section3.content.2')!
<a href="{{route("online_activities")}}">@lang('cw2020.online-activities.section3.content.1')</a> @lang('cw2020.online-activities.section3.content.2')!
</div>

</div>
Expand Down
5 changes: 3 additions & 2 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -732,9 +732,10 @@
[Codeweek4AllController::class, 'detail']
)->name('codeweek4all_details');

Route::get('/featured-activities', [OnlineEventsController::class, 'calendar'])->name(
'featured_activities'
Route::get('/online-activities', [OnlineEventsController::class, 'calendar'])->name(
'online_activities'
);
Route::permanentRedirect('/featured-activities', '/online-activities');

Route::get('/profile', function () {
$data = ['profileUser' => Auth()->user()];
Expand Down
22 changes: 15 additions & 7 deletions tests/Feature/OnlineEventsWorkflowTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public function super_admin_menu_links_to_all_online_activities(): void
}

#[Test]
public function featured_activities_page_shows_all_upcoming_open_online_events(): void
public function online_activities_page_shows_all_upcoming_open_online_events(): void
{
$this->seed('RolesAndPermissionsSeeder');

Expand Down Expand Up @@ -249,19 +249,19 @@ public function featured_activities_page_shows_all_upcoming_open_online_events()
'title' => 'Pending Open Online Hidden',
]);

$this->get('/featured-activities')
$this->get('/online-activities')
->assertStatus(200)
->assertSee($openOnlineEvent->title)
->assertDontSee($inviteOnlyEvent->title)
->assertDontSee($pendingEvent->title);
}

#[Test]
public function featured_activities_calendar_renders_outside_the_vue_root(): void
public function online_activities_calendar_renders_outside_the_vue_root(): void
{
$this->seed('RolesAndPermissionsSeeder');

$html = $this->get('/featured-activities')->assertStatus(200)->getContent();
$html = $this->get('/online-activities')->assertStatus(200)->getContent();

$nonVueStart = strpos($html, '<main id="non-vue"');
$component = strpos($html, 'wire:snapshot');
Expand All @@ -279,7 +279,7 @@ public function featured_activities_calendar_renders_outside_the_vue_root(): voi
}

#[Test]
public function featured_activities_month_filter_only_shows_events_for_selected_month(): void
public function online_activities_month_filter_only_shows_events_for_selected_month(): void
{
$this->seed('RolesAndPermissionsSeeder');

Expand Down Expand Up @@ -318,7 +318,7 @@ public function featured_activities_month_filter_only_shows_events_for_selected_
}

#[Test]
public function featured_activities_page_lists_activities_already_under_way(): void
public function online_activities_page_lists_activities_already_under_way(): void
{
$this->seed('RolesAndPermissionsSeeder');

Expand All @@ -342,7 +342,7 @@ public function featured_activities_page_lists_activities_already_under_way(): v
'title' => 'Already Finished Open Online Activity',
]);

$this->get('/featured-activities')
$this->get('/online-activities')
->assertStatus(200)
->assertSee($ongoing->title)
->assertDontSee($finished->title);
Expand Down Expand Up @@ -382,6 +382,14 @@ public function activities_already_under_way_are_listed_under_the_current_month(
);
}

#[Test]
public function the_old_featured_activities_url_redirects_to_online_activities(): void
{
$this->get('/featured-activities')
->assertStatus(301)
->assertRedirect('/online-activities');
}

#[Test]
public function promoted_event_creates_notification_for_administrators(): void
{
Expand Down
Loading