From ebe2f1d3ccd30bdc499fc80df01d840c3dfc9f90 Mon Sep 17 00:00:00 2001
From: cnachtigall1991 <40701475+cnachtigall1991@users.noreply.github.com>
Date: Wed, 20 Oct 2021 18:04:38 +0200
Subject: [PATCH] extracted closeNav function to Utils

---
 src/components/Nav.vue | 19 ++++++-------------
 src/utils/Utils.js     |  6 ++++++
 src/utils/index.js     |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/Nav.vue b/src/components/Nav.vue
index 63e2812..40a37c3 100644
--- a/src/components/Nav.vue
+++ b/src/components/Nav.vue
@@ -9,12 +9,12 @@
       <div id="mainNav" class="collapse navbar-collapse navbar-nav justify-content-between">
         <ul class="list-unstyled">
           <li class="nav-item">
-            <router-link class="navbar-brand" to="/" @click="closeNav">
+            <router-link class="navbar-brand" to="/" @click="closeNav('#mainNav')">
               CSGO<span class="text-up text-white fw-bold">WTF</span>
             </router-link>
           </li>
           <li class="nav-item">
-            <router-link class="nav-link" to="/explore" @click="closeNav">
+            <router-link class="nav-link" to="/explore" @click="closeNav('#mainNav')">
               Explore
             </router-link>
           </li>
@@ -50,7 +50,7 @@
 <script>
 import {reactive} from "vue";
 import {useStore} from 'vuex'
-import {GetUser, GoToPlayer} from '../utils'
+import {GetUser, GoToPlayer, closeNav} from '../utils'
 
 export default {
   name: 'Nav',
@@ -61,12 +61,6 @@ export default {
       error: ''
     })
 
-    const closeNav = () => {
-      const nav = document.querySelector('#mainNav')
-      if (nav.classList.contains('show'))
-        nav.classList.remove('show')
-    }
-
     const parseSearch = async () => {
       const input = data.searchInput
       const customUrlPattern = 'https://steamcommunity.com/id/'
@@ -135,10 +129,10 @@ export default {
             })
 
             if (store.state.vanityUrl) {
-              closeNav()
+              closeNav('#mainNav')
               GoToPlayer(store.state.vanityUrl)
             } else if (store.state.id64) {
-              closeNav()
+              closeNav('#mainNav')
               GoToPlayer(store.state.id64)
             }
 
@@ -166,10 +160,9 @@ export default {
         if (e.target.attributes.id.name === 'searchform' || e.target.attributes.id.name === 'search' || e.target.attributes.id.name === 'search-button')
           console.log('test')
       } else
-        closeNav()
+        closeNav('#mainNav')
     })
 
-
     return {
       data, parseSearch, closeNav
     }
diff --git a/src/utils/Utils.js b/src/utils/Utils.js
index a6b704e..238b9ad 100644
--- a/src/utils/Utils.js
+++ b/src/utils/Utils.js
@@ -2,6 +2,12 @@ export const setTitle = (title) => {
   document.title = `${title} | csgoWTF`
 }
 
+export const closeNav = (navSelector) => {
+  const nav = document.querySelector(navSelector)
+  if (nav.classList.contains('show'))
+    nav.classList.remove('show')
+}
+
 export const GetWinLoss = (matchResult, teamId) => {
   if (matchResult === teamId) {
     return 'win'
diff --git a/src/utils/index.js b/src/utils/index.js
index 90cd310..dd037e4 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -4,7 +4,7 @@ import {SaveLastVisitedToLocalStorage} from "./LocalStorage";
 import {GetHLTV_1} from "./HLTV";
 import {DisplayRank, LoadImage} from "./Display";
 import {GetUser, TrackMe, getPlayerValue} from "./ApiRequests";
-import {setTitle, GetWinLoss, truncate, checkStatEmpty, getPlayerArr, constructAvatarUrl, GetAvgRank, FixMapName} from "./Utils";
+import {setTitle, GetWinLoss, truncate, checkStatEmpty, getPlayerArr, constructAvatarUrl, GetAvgRank, FixMapName, closeNav} from "./Utils";
 
 export {
   FormatDate, FormatFullDuration, FormatFullDate, FormatDuration,
@@ -13,5 +13,5 @@ export {
   GetHLTV_1,
   DisplayRank, LoadImage,
   GetUser, TrackMe, getPlayerValue,
-  setTitle, GetWinLoss, truncate, checkStatEmpty, getPlayerArr, constructAvatarUrl, GetAvgRank, FixMapName
+  setTitle, GetWinLoss, truncate, checkStatEmpty, getPlayerArr, constructAvatarUrl, GetAvgRank, FixMapName, closeNav
 }