Merge branch 'feature/support-gmail-oauth' into dev

Author: bernardhanna

app/Services/Matchmaking/ProfileAvatarResolver.php

@@ -179,6 +179,16 @@ private function scoreMatch(string $candidate, string $indexKey, bool $isOrganis
             return 100;
         }
 
+        $candidateCompact = $this->compact($candidate);
+        $indexCompact = $this->compact($indexKey);
+        if (
+            $candidateCompact !== '' &&
+            $indexCompact !== '' &&
+            (str_contains($candidateCompact, $indexCompact) || str_contains($indexCompact, $candidateCompact))
+        ) {
+            return 65;
+        }
+
         $candidateTokens = array_values(array_filter(explode('-', $candidate)));
         $indexTokens = array_values(array_filter(explode('-', $indexKey)));
         $tokenOverlap = count(array_intersect($candidateTokens, $indexTokens));
@@ -204,5 +214,10 @@ private function scoreMatch(string $candidate, string $indexKey, bool $isOrganis
 
         return 0;
     }
+
+    private function compact(string $value): string
+    {
+        return preg_replace('/[^a-z0-9]/', '', strtolower($value)) ?? '';
+    }
 }
 

resources/views/community.blade.php

@@ -105,9 +105,11 @@ class="text-xl md:text-2xl leading-8 text-[#333E48] p-0 mb-6 max-md:max-w-full m
                                 <div class="flex flex-col sm:flex-row gap-3 sm:gap-4">
                                     <a
                                         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"
-                                        href="https://codeweek.eu/contact-us"
+                                        href="https://forms.cloud.microsoft/e/kWuLwq0hYR"
+                                        target="_blank"
+                                        rel="noopener noreferrer"
                                     >
-                                        <span>@lang('base.get_in_touch')</span>
+                                        <span>Apply now</span>
                                     </a>
                                     <a
                                         class="text-nowrap md:w-fit flex justify-center items-center border-2 border-[#1C4DA1] hover:border-hover-orange text-[#1C4DA1] hover:text-hover-orange duration-300 rounded-full py-4 px-8 font-semibold text-lg bg-white"