From 61f873e6d161bb38ffacd12cca09bab8c35b661c Mon Sep 17 00:00:00 2001
From: Burak Surmen <busurmen@gmail.com>
Date: Wed, 26 Feb 2020 15:07:39 +0300
Subject: [PATCH] Fixed conflicts

---
 home/index.js  | 19 +++++++++++++++++--
 home/style.css | 10 ++++++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/home/index.js b/home/index.js
index b0177f0..441ce55 100644
--- a/home/index.js
+++ b/home/index.js
@@ -59,7 +59,6 @@ class MembersView {
                 `).join('')
 
                 modal.innerHTML = `
-
                          <div class="modal-content">
                               <h4>${members[i].title}</h4>
                               <div>
@@ -107,6 +106,19 @@ class MembersView {
                         }
                     }
                 })
+                let socialIconsVisibility = document.querySelectorAll("#memberInfoModal > div > div.social > a")
+
+                if (Auth.isLoggedIn == false) {
+                    socialIconsVisibility.forEach(hideIcon => hideIcon.remove())
+                }
+
+                social.insertAdjacentHTML('beforeend', `<button class="loginBtn"  onclick="signInModalInstance.open();" >Login </button>`);
+
+                let loginBtnVisibility = document.querySelector("#memberInfoModal > div > div.social > button")
+
+                if (Auth.isLoggedIn == true) {
+                    loginBtnVisibility.remove()
+                }
                 memberInfoModalInstance.open()
             })
 
@@ -148,6 +160,7 @@ function configureTypeNavButtons() {
     const type = document.getElementById("type");
     const beMember = document.getElementsByClassName("beMember")[0];
     const beMemberDropdown = document.getElementsByClassName("beMember")[1];
+    const navMemberSelect = document.getElementById("type");
 
     const urlParams = new URLSearchParams(window.location.search);
     const myParam = urlParams.get('type');
@@ -157,13 +170,15 @@ function configureTypeNavButtons() {
         memberRef = db.collection("mentees");
         pageTitle.innerText = "Mentees"
         beMember.innerHTML = 'Be a Mentee'
+        navMemberSelect.href = "index.html?type=mentors"
     } else {
         memberRef = db.collection("mentors");
         pageTitle.innerText = "Mentors"
         type.innerText = 'Mentees'
         beMember.innerHTML = 'Be a Mentor'
         beMemberDropdown.innerHTML = 'Be a Mentor'
+        navMemberSelect.href = "index.html?type=mentees"
     }
 }
 
-document.addEventListener("DOMContentLoaded", run);
+document.addEventListener("DOMContentLoaded", run);
\ No newline at end of file
diff --git a/home/style.css b/home/style.css
index 811e99a..f860cc4 100644
--- a/home/style.css
+++ b/home/style.css
@@ -2,7 +2,7 @@ nav {
   box-shadow: none;
 }
 
-nav ul a {
+nav ul a,.loginBtn {
   color: #f44336;
   font-size: 15px;
 }
@@ -36,6 +36,12 @@ nav ul a {
   font-weight: 500;
 }
 
+.loginBtn, .loginBtn:hover {
+  font-weight: 700;
+  border: 0;
+  background: transparent;
+}
+
 .modal-content ul li a {
   color: white;
   background-color: #f44336;
@@ -105,4 +111,4 @@ p.location {
   .valign-wrapper {
     display: block;
   }
-}
+}
\ No newline at end of file