Skip to content

Commit 2c3d99d

Browse files
bernardhannabernardhanna
committed
Reverting dev content to version bf6ab33 to test
1 parent dd5cccf commit 2c3d99d

40 files changed

+208
-225
lines changed

‎app/Console/Commands/excel/CoderDojoEvents.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function handle(): void
4242

4343
Excel::import(
4444
new CoderDojoEventsImport(),
45-
'events.xlsx',
45+
'events-coderdojobelgium.xlsx',
4646
'excel'
4747
);
4848
}

‎app/Event.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@ class Event extends Model
7676

7777
//protected $appends = ['LatestModeration'];
7878

79-
public function getUrlAttribute() {
80-
return route('view_event', [
81-
'event' => $this->id,
82-
'slug' => $this->slug
83-
]);
84-
}
85-
8679
public function getJavascriptData()
8780
{
8881
return $this->only(['geoposition', 'title', 'description']);

‎app/Http/Controllers/PodcastsController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public function index(Request $request): View
1919

2020
public function show(Podcast $podcast): View
2121
{
22+
2223
return view('podcast', compact('podcast'));
2324
}
2425

‎app/Http/Controllers/SearchController.php

Lines changed: 118 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,127 @@
1-
<?php
1+
<?php
22

33
namespace App\Http\Controllers;
44

5+
use App\Country;
6+
use App\Event;
7+
use App\Filters\EventFilters;
8+
use App\Http\Transformers\EventTransformer;
9+
use Carbon\Carbon;
510
use Illuminate\Http\Request;
11+
use Illuminate\Support\Arr;
12+
use Illuminate\Support\Facades\Cache;
13+
use Illuminate\Support\Facades\Log;
14+
use Illuminate\View\View;
615

716
class SearchController extends Controller
817
{
9-
public function index()
18+
protected $eventTransformer;
19+
20+
/**
21+
* EventController constructor.
22+
*/
23+
public function __construct(EventTransformer $eventTransformer)
24+
{
25+
$this->eventTransformer = $eventTransformer;
26+
}
27+
28+
public function search(Request $request): View
29+
{
30+
31+
$query = $request->input('q', '');
32+
$selected_year = $request->input('year', Carbon::now()->year);
33+
34+
$country_iso = $request->input('country_iso', null);
35+
$tag = $request->input('tag', '');
36+
37+
$selected_country = [];
38+
39+
if (! is_null($country_iso)) {
40+
$country = Country::where('iso', $country_iso)->first();
41+
if ($country) {
42+
$country->translation = __('countries.'.$country->name);
43+
$selected_country[] = $country;
44+
}
45+
46+
}
47+
48+
$current_year = Carbon::now()->year;
49+
$years = [];
50+
for ($year = $current_year; $year >= 2014; $year--) {
51+
$years[] = $year;
52+
}
53+
54+
return view('event.search', compact(['query', 'years', 'selected_country', 'selected_year', 'tag']));
55+
}
56+
57+
public function searchPOST(EventFilters $filters, Request $request)
58+
{
59+
$events = $this->getEvents($filters);
60+
61+
//Log::info($request->input('page'));
62+
if ($request->input('page')) {
63+
$result = [$events];
64+
} else {
65+
Log::info('no page');
66+
$eventsMap = $this->getAllEventsToMap($filters);
67+
$result = [$events, $eventsMap];
68+
}
69+
70+
return $result;
71+
}
72+
73+
protected function getEvents(EventFilters $filters)
1074
{
11-
return view('static.search');
75+
76+
$events = Event::where('status', 'like', 'APPROVED')
77+
->filter($filters)
78+
->orderBy('start_date')
79+
->get()
80+
->groupBy(function ($event) {
81+
if ($event->start_date <= Carbon::today()) {
82+
return 'past';
83+
}
84+
85+
return 'future';
86+
});
87+
88+
if (is_null($events->get('future')) || is_null($events->get('past'))) {
89+
return $events->flatten()->paginate(12);
90+
}
91+
92+
return $events->get('future')->merge($events->get('past'))->paginate(12);
93+
94+
}
95+
96+
protected function getAllEventsToMap(EventFilters $filters)
97+
{
98+
99+
$flattened = Arr::flatten($filters->getFilters());
100+
101+
$composed_key = '';
102+
103+
foreach ($flattened as $value) {
104+
$composed_key .= $value.',';
105+
}
106+
107+
$value = Cache::get($composed_key, function () use ($composed_key, $filters) {
108+
Log::info("Building cache [{$composed_key}]");
109+
$events = Event::where('status', 'like', 'APPROVED')
110+
->filter($filters)
111+
->get();
112+
113+
$events = $this->eventTransformer->transformCollection($events);
114+
115+
$events = $events->groupBy('country');
116+
117+
Cache::put($composed_key, $events, 5 * 60);
118+
119+
return $events;
120+
});
121+
122+
Log::info("Serving from cache [{$composed_key}]");
123+
124+
return $value;
125+
12126
}
13-
}
127+
}

‎app/Imports/IrelandDreamSpaceImport.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function model(array $row): ?Model
4242
'description' => '',
4343
'organizer_type' => $row['type_of_organization'],
4444
'activity_type' => $row['activity_type'],
45-
'location' => $row['address'],
45+
'location' => '',
4646
'event_url' => '',
4747
'contact_person' => $row['email'],
4848
'user_email' => '',
@@ -55,9 +55,9 @@ public function model(array $row): ?Model
5555
'codeweek_for_all_participation_code' => '',
5656
'start_date' => $this->parseDate($row['date']),
5757
'end_date' => $this->parseDate($row['date']),
58-
'geoposition' => $row['latitude'].','.$row['longitude'],
59-
'longitude' => $row['latitude'],
60-
'latitude' => $row['latitude'],
58+
'geoposition' => '',
59+
'longitude' => '',
60+
'latitude' => '',
6161
'language' => '',
6262
'approved_by' => 19588,
6363
'mass_added_for' => 'Excel',

‎app/Livewire/PartnerFilterComponent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public function selectFilter($filter)
1818

1919
public function render()
2020
{
21-
return view('livewire.filter-component', [
21+
return view('livewire.partner-filter-component', [
2222
'filters' => ['Partners', 'Council Presidency', 'EU Code Week Supporters'] // Available filters
2323
]);
2424
}

‎app/Podcast.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ class Podcast extends Model implements Feedable
1313
//
1414
protected $guarded = [];
1515

16-
public function getUrlAttribute() {
17-
return route('podcast', ['podcast' => $this->id]);
18-
}
19-
2016
protected function casts(): array
2117
{
2218
return [

‎app/Providers/AppServiceProvider.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
use App\Event;
66
use App\Observers\EventObserver;
77
use Carbon\Carbon;
8+
use Illuminate\Database\Eloquent\Model;
89
use Illuminate\Pagination\LengthAwarePaginator;
910
use Illuminate\Support\Collection;
1011
use Illuminate\Support\Facades\Gate;
1112
use Illuminate\Support\Facades\View;
1213
use Illuminate\Support\ServiceProvider;
1314
use Illuminate\Validation\Rules\Password;
1415
use Illuminate\Support\Facades\Blade;
16+
use Livewire\Livewire;
1517

1618
class AppServiceProvider extends ServiceProvider
1719
{

‎config/codeweek.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
'MAP_TILES' => env('MAP_TILES', ''),
1313
'EEDUCATION_CLIENTID' => env('EEDUCATION_CLIENTID', null),
1414
'LOCALES' => env('LOCALES', null),
15-
'blog_url' => env('BLOG_URL', 'https://codeweek.eu/blog'),
15+
1616
];

‎public/css/fonts.css

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -60,67 +60,3 @@
6060
src: URL('/fonts/OCR A Std Regular.ttf') format('truetype');
6161
}
6262

63-
/* Blinker */
64-
@font-face {
65-
font-family: 'Blinker';
66-
src: URL('/fonts/blinker/Blinker-Light.ttf') format('truetype');
67-
font-weight: 300;
68-
font-style: normal;
69-
}
70-
71-
@font-face {
72-
font-family: 'Blinker';
73-
src: URL('/fonts/blinker/Blinker-Regular.ttf') format('truetype');
74-
font-weight: 400;
75-
font-style: normal;
76-
}
77-
78-
@font-face {
79-
font-family: 'Blinker';
80-
src: URL('/fonts/blinker/Blinker-SemiBold.ttf') format('truetype');
81-
font-weight: 600;
82-
font-style: normal;
83-
}
84-
85-
@font-face {
86-
font-family: 'Blinker';
87-
src: URL('/fonts/blinker/Blinker-Bold.ttf') format('truetype');
88-
font-weight: 700;
89-
font-style: normal;
90-
}
91-
92-
/* Montserrat */
93-
@font-face {
94-
font-family: 'Montserrat';
95-
src: URL('/fonts/montserrat/Montserrat-Light.ttf') format('truetype');
96-
font-weight: 300;
97-
font-style: normal;
98-
}
99-
100-
@font-face {
101-
font-family: 'Montserrat';
102-
src: URL('/fonts/montserrat/Montserrat-Regular.ttf') format('truetype');
103-
font-weight: 400;
104-
font-style: normal;
105-
}
106-
107-
@font-face {
108-
font-family: 'Montserrat';
109-
src: URL('/fonts/montserrat/Montserrat-Medium.ttf') format('truetype');
110-
font-weight: 500;
111-
font-style: normal;
112-
}
113-
114-
@font-face {
115-
font-family: 'Montserrat';
116-
src: URL('/fonts/montserrat/Montserrat-SemiBold.ttf') format('truetype');
117-
font-weight: 600;
118-
font-style: normal;
119-
}
120-
121-
@font-face {
122-
font-family: 'Montserrat';
123-
src: URL('/fonts/montserrat/Montserrat-Bold.ttf') format('truetype');
124-
font-weight: 700;
125-
font-style: normal;
126-
}

‎resources/assets/sass/components/banner.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,6 @@
142142
.codeweek-banner.about{
143143
background-color: #72A8D0;
144144
}
145-
.codeweek-banner.search{
146-
background-color: #164194;
147-
}
148145
.codeweek-banner.error{
149146
background-color: #e57373;
150147
}

‎resources/assets/sass/components/containers.scss

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -324,16 +324,4 @@
324324
.hackathons-content-grid .author{
325325
color: $main-color;
326326
padding: 20px;
327-
}
328-
329-
.codeweek-container-lg {
330-
max-width: 1460px;
331-
width: 100%;
332-
padding: 0 20px;
333-
}
334-
335-
.codeweek-container {
336-
max-width: 1220px;
337-
width: 100%;
338-
padding: 0 20px;
339-
}
327+
}

‎resources/excel/Code Week Events - Ireland Dream Space .xlsx

-153 Bytes
Binary file not shown.

‎resources/lang/al/home.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?php
22

33
return [
4-
'about' => 'EU Code Week është një nismë në terren që synon të sjellë
5-
kodimin dhe “alfabetizmin” dixhital te të gjithë në një mënyrë
6-
argëtuese dhe angazhuese.',
7-
'when' => '14-27 tetor 2024',
8-
'when_text' => 'Mësimi i kodimit na ndihmon të kuptojmë logjikisht botën rrotull nesh që
9-
ndryshon shpejt, të zgjerojmë të kuptuarin tonë rreth mënyrës
10-
se si funksionon teknologjia, si dhe të zhvillojmë aftësi dhe kapacitete për
11-
të eksploruar ide të reja dhe për të sjellë inovacion.',
4+
'about' =>
5+
'EU Code Week është një nismë në terren që synon të sjellë
6+
kodimin dhe “alfabetizmin” dixhital te të gjithë në një mënyrë
7+
argëtuese dhe angazhuese.',
8+
'when' => 'Pievienojieties mums svētku priekam!',
9+
'when_text' =>
10+
'Programmēšanas apguve palīdz mums izprast strauji mainīgo pasauli apkārt. Pievienojieties miljoniem citu organizatoru un dalībnieku, lai iedvesmotu programmēšanas un datoriskās domāšanas prasmju attīstību, izpētītu jaunas idejas un radītu inovācijas nākotnei.',
11+
'xmas_text' => 'Padariet šo svētku sezonu mirdzošu ar inovācijām un radošumu! Pievienojieties mūsu "Coding@Christmas" jautrībai, pievienojot savu programmēšanas aktivitāti mūsu kartei, un iegūstiet iespēju laimēt micro:bit komplektu saviem skolēniem. Svinēsim svētkus, dodot spēku nākamajai domātāju un radītāju paaudzei. Pievienojiet savu aktivitāti jau šodien un palīdziet iedvesmot gaišāku nākotni!',
1212
'school_banner_title' => 'Përfshihu!',
13+
'button_text' => 'Iesaisties!',
1314
'school_banner_text' => 'Jeni mësues?',
1415
'school_banner_text2' => 'Klikoni këtu për të mësuar si të përfshiheni!',
1516
'organize_activity_title' => 'Organizoni ose merrni pjesë në një aktivitet',

‎resources/lang/ba/home.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
'when' => '14.-27. oktobar 2024.',
66
'when_text' => 'Učenje kodiranja pomaže nam da shvatimo svijet oko nas koji doživljava brze promjene, da pro&scaron;irimo svoje shvatanje kako funkcionira tehnologija te da razvijemo vje&scaron;tine i kapacitete u cilju istraživanja novih ideja i inoviranja.',
77
'school_banner_title' => 'Angažirajte se!',
8+
'xmas_text' => '',
9+
'button_text' => 'Get Involved!',
810
'school_banner_text' => 'Jeste li vi nastavnik?',
911
'school_banner_text2' => 'Kliknite ovdje i saznajte kako da se angažirate!',
1012
'organize_activity_title' => 'Organizirajte aktivnost ili joj se pridružite',

‎resources/lang/bg/community.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,4 @@
3535
'и разгледайте списъка с посланиците на Европейската седмица на програмирането.',
3636
'Ако във вашата страна има посланици, моля, свържете се директно с тях, за да разберете как най-добре можете да подкрепите инициативата. Ако във вашата страна няма посланик, можете да пишете на следния адрес',
3737
],
38-
39-
'hub_BG' => 'Dzhuniar Achiyvmant Balgariya',
40-
'hub_level_BG' => 'Национален център',
41-
'hub_desc_BG' => 'Джуниър Ачийвмънт България JA България се фокусира върху овластяването на младежите в България чрез различни образователни инициативи, насочени към насърчаване на предприемачеството и развитие на умения. Организацията предоставя програми, които насърчават креативността, критичното мислене и лидерските умения сред младите хора. Ораганизацията си сътрудничи с училища, университети и компании, за да създаде възможности за професионално обучение и стажове, като по този начин оборудва младежите с инструментите, от които се нуждаят, за да успеят в съвременната работна сила. JA България също набляга на ангажираността на общността и социалната отговорност сред своите участници.'
4238
];

‎resources/lang/bg/home.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
return [
44
'about' => 'Европейската седмица на програмирането е инициатива, насочена към гражданите, която има за цел да представи програмирането и цифровата грамотност на всички по забавен и развлекателен начин.',
5-
'when' => '14-27 октомври 2024 г.',
5+
'when' => 'Присъединете се към нас за празнично забавление!',
66
'when_text' => 'Усвояването на програмирането ни помага да разбираме бързо променящия се заобикалящ ни свят, да научим повече за начина на работа на технологиите и да развиваме умения и възможности, за да проучваме нови идеи и да създаваме иновации.',
77
'school_banner_title' => 'Вземете участие!',
8+
'xmas_text' => 'Направете този празничен сезон искрящ с иновации и творчество! Присъединете се към забавлението „Coding@Christmas“, като добавите своята дейност по кодиране към нашата карта и имате шанс да спечелите комплект micro:bit за своите ученици. Нека отпразнуваме празниците, като дадем възможност на следващото поколение мислители и творци. Добавете дейността си днес и помогнете да вдъхновим едно по-светло бъдеще!',
9+
'button_text' => 'Вземете участие!',
810
'school_banner_text' => 'Вие сте учител?',
911
'school_banner_text2' => 'Щракнете тук, за да разберете как да се включите!',
1012
'organize_activity_title' => 'Организирайте или се присъединете към събитие',

‎resources/lang/cs/home.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
return [
44
'about' => 'Evropský týden programování je iniciativa, jejímž cílem je zábavným a aktivním způsobem přiblížit programování a digitální gramotnost každému člověku.',
5-
'when' => '14.-27. října 2024',
5+
'when' => 'Připojte se k nám a užijte si sváteční zábavu!',
66
'when_text' => 'Naučit se programovat nám pomáhá chápat rychle se měnící svět kolem nás, lépe rozumět tomu, jak fungují technologie, rozvíjet dovednosti a schopnosti potřebné ke zkoumání nových myšlenek a inovovat.',
77
'school_banner_title' => 'Zapojte se!',
8+
'xmas_text' => 'Zpříjemněte si letošní sváteční období inovacemi a kreativitou! Připojte se k naší zábavě „Coding@Christmas“ přidáním své kódovací aktivity na naši mapu a získejte šanci vyhrát pro své studenty sadu micro:bit. Oslavme svátky tím, že dáme příležitost další generaci myslitelů a tvůrců. Přidejte svou aktivitu ještě dnes a pomozte inspirovat lepší budoucnost!',
9+
'button_text' => 'Zapojte se!',
810
'school_banner_text' => 'Jste učitel?',
911
'school_banner_text2' => 'Klikněte zde, abyste se dozvěděl/a, jak se zapojit!',
1012
'organize_activity_title' => 'Zorganizujte akci nebo se k nějaké připojte',

0 commit comments

Comments
 (0)