diff --git a/resources/lang/bg/menu.php b/resources/lang/bg/menu.php index ebe4187a1..759cbd03b 100644 --- a/resources/lang/bg/menu.php +++ b/resources/lang/bg/menu.php @@ -52,7 +52,7 @@ 'coding@home' => 'Кодиране @ Home', 'values' => 'Нашите ценности', 'online_events' => 'Онлайн дейности', - 'featured_activities' => 'Подбрани събития ', + 'featured_activities' => 'Онлайн дейности', 'codeweek2020' => 'Издание 2020', 'register_activity' => 'Регистриране на Активност', 'select_language' => 'Изберете език', diff --git a/resources/lang/cs/menu.php b/resources/lang/cs/menu.php index 632f889e7..58e3799d5 100644 --- a/resources/lang/cs/menu.php +++ b/resources/lang/cs/menu.php @@ -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', diff --git a/resources/lang/da/menu.php b/resources/lang/da/menu.php index 8fea8a3c0..29f7c5e1c 100644 --- a/resources/lang/da/menu.php +++ b/resources/lang/da/menu.php @@ -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', diff --git a/resources/lang/de/menu.php b/resources/lang/de/menu.php index ca01d10de..6fbffeb49 100644 --- a/resources/lang/de/menu.php +++ b/resources/lang/de/menu.php @@ -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', diff --git a/resources/lang/el/menu.php b/resources/lang/el/menu.php index f2bc8ec24..9153f2bab 100644 --- a/resources/lang/el/menu.php +++ b/resources/lang/el/menu.php @@ -52,7 +52,7 @@ 'coding@home' => 'Κωδικοποίηση@Σπίτι', 'values' => 'Oι αξίες μας', 'online_events' => 'Διαδικτυακές Δραστηριότητες', - 'featured_activities' => 'Επιλεγμένες Δραστηριότητες', + 'featured_activities' => 'Διαδικτυακές Δραστηριότητες', 'codeweek2020' => 'Διοργάνωση 2020', 'register_activity' => 'Καταχώρηση Δραστηριότητας', 'select_language' => 'Επιλέξτε γλώσσα', diff --git a/resources/lang/en/menu.php b/resources/lang/en/menu.php index 6609ab908..94d3f4858 100644 --- a/resources/lang/en/menu.php +++ b/resources/lang/en/menu.php @@ -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', diff --git a/resources/lang/fi/menu.php b/resources/lang/fi/menu.php index b46cbbdfe..8c05a6fe3 100644 --- a/resources/lang/fi/menu.php +++ b/resources/lang/fi/menu.php @@ -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', diff --git a/resources/lang/hr/menu.php b/resources/lang/hr/menu.php index 5906fba92..0a2931e7b 100644 --- a/resources/lang/hr/menu.php +++ b/resources/lang/hr/menu.php @@ -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', diff --git a/resources/lang/it/menu.php b/resources/lang/it/menu.php index ce07aeb97..90eab65f9 100644 --- a/resources/lang/it/menu.php +++ b/resources/lang/it/menu.php @@ -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', diff --git a/resources/lang/lt/menu.php b/resources/lang/lt/menu.php index 7892a8d84..3fd23ed48 100644 --- a/resources/lang/lt/menu.php +++ b/resources/lang/lt/menu.php @@ -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ą', diff --git a/resources/lang/lv/menu.php b/resources/lang/lv/menu.php index acab8b254..d49aa2f1c 100644 --- a/resources/lang/lv/menu.php +++ b/resources/lang/lv/menu.php @@ -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', diff --git a/resources/lang/pl/menu.php b/resources/lang/pl/menu.php index dfd2d50b7..a8f1dae87 100644 --- a/resources/lang/pl/menu.php +++ b/resources/lang/pl/menu.php @@ -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', diff --git a/resources/lang/ro/menu.php b/resources/lang/ro/menu.php index bc037d9cd..2da269e74 100644 --- a/resources/lang/ro/menu.php +++ b/resources/lang/ro/menu.php @@ -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', diff --git a/resources/lang/sk/menu.php b/resources/lang/sk/menu.php index 804704508..423d566b0 100644 --- a/resources/lang/sk/menu.php +++ b/resources/lang/sk/menu.php @@ -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', diff --git a/resources/lang/sl/menu.php b/resources/lang/sl/menu.php index 5563c2f5a..c6d819e22 100644 --- a/resources/lang/sl/menu.php +++ b/resources/lang/sl/menu.php @@ -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', diff --git a/resources/lang/sv/menu.php b/resources/lang/sv/menu.php index 7750794ef..002e750f7 100644 --- a/resources/lang/sv/menu.php +++ b/resources/lang/sv/menu.php @@ -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', diff --git a/resources/lang/tr/menu.php b/resources/lang/tr/menu.php index 11e2acb4a..abc09b447 100644 --- a/resources/lang/tr/menu.php +++ b/resources/lang/tr/menu.php @@ -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', diff --git a/resources/lang/ua/menu.php b/resources/lang/ua/menu.php index 24af4917a..d19cd34ca 100644 --- a/resources/lang/ua/menu.php +++ b/resources/lang/ua/menu.php @@ -52,7 +52,7 @@ 'coding@home' => 'Coding@Home', 'values' => 'Наші цінності', 'online_events' => 'Онлайн-заходи', - 'featured_activities' => 'Основні заходи', + 'featured_activities' => 'Онлайн-заходи', 'codeweek2020' => 'Версія 2020', 'register_activity' => 'Зареєструвати захід', 'select_language' => 'Виберіть мову', diff --git a/resources/views/layout/menu.blade.php b/resources/views/layout/menu.blade.php index 2e2162bf3..4efb35ee3 100644 --- a/resources/views/layout/menu.blade.php +++ b/resources/views/layout/menu.blade.php @@ -80,7 +80,7 @@ class="cookweek-link hover-underline !text-[#1C4DA1] !text-[16px]"
  • @lang('menu.map')
    • -
  • @lang('menu.featured_activities')
    • +
  • @lang('menu.featured_activities')
  • @lang('menu.add_event')
  • @lang('event.scoreboard_by_country')
  • @lang('menu.guide_on_activities')
    • diff --git a/resources/views/online-calendar/oc-index.blade.php b/resources/views/online-calendar/oc-index.blade.php index 0bde1ba05..c17701fb9 100644 --- a/resources/views/online-calendar/oc-index.blade.php +++ b/resources/views/online-calendar/oc-index.blade.php @@ -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') @@ -27,7 +27,7 @@

    - Featured activities + Online Activities

    @lang('snippets.featured-activities') diff --git a/resources/views/static/codeweek2020.blade.php b/resources/views/static/codeweek2020.blade.php index c15f558a4..5cea5c089 100644 --- a/resources/views/static/codeweek2020.blade.php +++ b/resources/views/static/codeweek2020.blade.php @@ -30,7 +30,7 @@

    @lang('cw2020.online-activities.title')

    @lang('cw2020.online-activities.subtitle.0') - @lang('cw2020.online-activities.subtitle.1') @lang('cw2020.online-activities.subtitle.2'). + @lang('cw2020.online-activities.subtitle.1') @lang('cw2020.online-activities.subtitle.2').

    @lang('cw2020.online-activities.section1.title') @@ -51,7 +51,7 @@

    @lang('cw2020.online-activities.section3.content.0') - @lang('cw2020.online-activities.section3.content.1') @lang('cw2020.online-activities.section3.content.2')! + @lang('cw2020.online-activities.section3.content.1') @lang('cw2020.online-activities.section3.content.2')!
    diff --git a/routes/web.php b/routes/web.php index d46ae1a44..1c7453b5e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -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()]; diff --git a/tests/Feature/OnlineEventsWorkflowTest.php b/tests/Feature/OnlineEventsWorkflowTest.php index 4d366262c..83bd59f11 100644 --- a/tests/Feature/OnlineEventsWorkflowTest.php +++ b/tests/Feature/OnlineEventsWorkflowTest.php @@ -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'); @@ -249,7 +249,7 @@ 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) @@ -257,11 +257,11 @@ public function featured_activities_page_shows_all_upcoming_open_online_events() } #[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, '
    seed('RolesAndPermissionsSeeder'); @@ -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'); @@ -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); @@ -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 {