From 59d8cffddbb776aee34ab934e3393a6aaf013763 Mon Sep 17 00:00:00 2001
From: Rachel Sidney <13515124@std.stei.itb.ac.id>
Date: Fri, 11 May 2018 10:08:35 +0700
Subject: [PATCH] fix navbar
---
app/Http/Controllers/Auth/SocialAccountsController.php | 4 ++--
resources/views/inc/navbarhome.blade.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/Http/Controllers/Auth/SocialAccountsController.php b/app/Http/Controllers/Auth/SocialAccountsController.php
index 32127ba..6ae8b46 100644
--- a/app/Http/Controllers/Auth/SocialAccountsController.php
+++ b/app/Http/Controllers/Auth/SocialAccountsController.php
@@ -41,8 +41,8 @@ class SocialAccountsController extends Controller
//dd($accountService->user());
//dd(auth()->guard('member')->user());
try {
- $user = Socialite::with($provider)->user();
- //uncomment this: $user = Socialite::with($provider)->setHttpClient(new \GuzzleHttp\Client(['curl' => array(CURLOPT_PROXY => 'cache.itb.ac.id', CURLOPT_PROXYPORT => 8080, CURLOPT_PROXYUSERPWD => 'yowinarto:06561330', CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_2)]))->user();
+ //$user = Socialite::with($provider)->user();
+ $user = Socialite::with($provider)->setHttpClient(new \GuzzleHttp\Client(['curl' => array(CURLOPT_PROXY => 'cache.itb.ac.id', CURLOPT_PROXYPORT => 8080, CURLOPT_PROXYUSERPWD => 'yowinarto:06561330', CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_2)]))->user();
//dd(Socialite::with($provider)->setHttpClient(new \GuzzleHttp\Client(['curl' => array(CURLOPT_PROXY => 'cache.itb.ac.id', CURLOPT_PROXYPORT => 8080, CURLOPT_PROXYUSERPWD => 'yowinarto:06561330', CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_2
//)]))->user());
} catch (Exception $e) {
diff --git a/resources/views/inc/navbarhome.blade.php b/resources/views/inc/navbarhome.blade.php
index aa66daa..75e151b 100644
--- a/resources/views/inc/navbarhome.blade.php
+++ b/resources/views/inc/navbarhome.blade.php
@@ -28,7 +28,7 @@
</li>-->
@if(Request::is('/'))
- <div class="navbar-nav ml-auto" style="margin-top: 1.20%; padding-left: 1%; padding-right: 1%">
+ <div class="navbar-nav ml-auto nav navbar-left">
<li class="nav-item dropdown" style="">
<a id="navbarDropdown login-dropdown" class="nav-link dropdown-toggle login" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<span>Home</span>
@@ -59,7 +59,7 @@
</li>
</div>
@else
- <div class="navbar-nav ml-auto" style="margin-top: 1.20%; padding-left: 1%; padding-right: 1%">
+ <div class="navbar-nav ml-auto nav navbar-left">
<li class="nav-item dropdown" style="">
<a id="navbarDropdown login-dropdown" class="nav-link dropdown-toggle login" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
<span>Home</span>
--
GitLab