Skip to content

Commit b9bc7a1

Browse files
committed
Merge branch 'dev' into master
2 parents 4c79efb + 0583352 commit b9bc7a1

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

app/User.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Illuminate\Support\Facades\Log;
2323
use Illuminate\Support\Facades\Storage;
2424
use Spatie\Permission\Traits\HasRoles;
25+
use Throwable;
2526

2627
/**
2728
* App\User
@@ -378,7 +379,19 @@ public function getFullNameAttribute()
378379

379380
public static function getGeoIPData()
380381
{
381-
return geoip(geoip()->getClientIP());
382+
try {
383+
return geoip(geoip()->getClientIP());
384+
} catch (Throwable $e) {
385+
Log::warning('GeoIP lookup failed, using default location fallback.', [
386+
'error' => $e->getMessage(),
387+
]);
388+
389+
return (object) [
390+
'iso_code' => config('geoip.default_location.iso_code', 'BE'),
391+
'lat' => config('geoip.default_location.lat'),
392+
'lon' => config('geoip.default_location.lon'),
393+
];
394+
}
382395
}
383396

384397
public function activities($edition)

resources/views/community.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class="text-xl md:text-2xl leading-8 text-[#333E48] p-0 mb-6 max-md:max-w-full m
105105
<div class="flex flex-col sm:flex-row gap-3 sm:gap-4">
106106
<a
107107
class="text-nowrap md:w-fit flex justify-center items-center bg-primary hover:bg-hover-orange duration-300 text-[#20262C] rounded-full py-4 px-8 font-semibold text-lg"
108-
href="{{ route('contact-us') }}"
108+
href="https://codeweek.eu/contact-us"
109109
>
110110
<span>@lang('base.get_in_touch')</span>
111111
</a>
@@ -115,7 +115,7 @@ class="text-nowrap md:w-fit flex justify-center items-center border-2 border-[#1
115115
target="_blank"
116116
rel="noopener noreferrer"
117117
>
118-
<span>Read the call</span>
118+
<span>Find our more</span>
119119
</a>
120120
</div>
121121
</div>

0 commit comments

Comments
 (0)