Merge branch 'feature-regapp' into development

# Conflicts: # resources/views/auth/login.blade.php
Steinbeck-Lab · Dec 16, 2024 · a6fa2dc · a6fa2dc
2 parents c2cb39b + e16c822
commit a6fa2dc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/config/services.php b/config/services.php
@@ -43,4 +43,10 @@
         'redirect' => env('GOOGLE_REDIRECT_URL'),
     ],
 
+    'regapp' => [
+        'client_id' => env('NFDI_CLIENT_ID'),
+        'client_secret' => env('NFDI_CLIENT_SECRET'),
+        'redirect' => env('NFDI_REDIRECT_URL'),
+    ],
+
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -59,8 +59,8 @@
 
             <div class="mt-6 grid grid-cols-2 gap-4">
                 <a href="/auth/login/google"
-                    class="flex w-full items-center justify-center gap-3 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:ring-transparent">
-                    <svg class="h-5 w-5" viewBox="0 0 24 24" aria-hidden="true">
+                    class="flex w-full items-center justify-center gap-3 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:ring-transparent py-4">
+                    <svg class="h-6 w-6" viewBox="0 0 24 24" aria-hidden="true">
                         <path
                             d="M12.0003 4.75C13.7703 4.75 15.3553 5.36002 16.6053 6.54998L20.0303 3.125C17.9502 1.19 15.2353 0 12.0003 0C7.31028 0 3.25527 2.69 1.28027 6.60998L5.27028 9.70498C6.21525 6.86002 8.87028 4.75 12.0003 4.75Z"
                             fill="#EA4335"></path>
@@ -74,17 +74,23 @@ class="flex w-full items-center justify-center gap-3 rounded-md bg-white px-3 py
                             d="M12.0004 24.0001C15.2404 24.0001 17.9654 22.935 19.9454 21.095L16.0804 18.095C15.0054 18.82 13.6204 19.245 12.0004 19.245C8.8704 19.245 6.21537 17.135 5.2654 14.29L1.27539 17.385C3.25539 21.31 7.3104 24.0001 12.0004 24.0001Z"
                             fill="#34A853"></path>
                     </svg>
-                    <span class="text-sm font-semibold leading-6">Google</span>
+                    <span class="text-lg font-semibold leading-6">Google</span>
                 </a>
 
                 <a href="/auth/login/github"
                     class="flex w-full items-center justify-center gap-3 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:ring-transparent">
-                    <svg class="h-5 w-5 fill-[#24292F]" fill="currentColor" viewBox="0 0 20 20" aria-hidden="true">
+                    <svg class="h-6 w-6 fill-[#24292F]" fill="currentColor" viewBox="0 0 20 20" aria-hidden="true">
                         <path fill-rule="evenodd"
                             d="M10 0C4.477 0 0 4.484 0 10.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0110 4.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.203 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.942.359.31.678.921.678 1.856 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0020 10.017C20 4.484 15.522 0 10 0z"
                             clip-rule="evenodd"></path>
                     </svg>
-                    <span class="text-sm font-semibold leading-6">GitHub</span>
+                    <span class="text-lg font-semibold leading-6">GitHub</span>
+                </a>
+                <a href="/auth/login/regapp"
+                    class="flex w-full col-span-2 items-center justify-center gap-3 rounded-md bg-white px-3 py-2 text-sm font-semibold text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 hover:bg-gray-50 focus-visible:ring-transparent">
+                    <span class="text-sm font-semibold leading-6">
+                        <img src="/img/nfdi-aai.png" alt="">
+                    </span>
                 </a>
             </div>
         </div>