aindreas/traintracker
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add unit tests and fix map load

Browse Source
This commit is contained in:
Conor McNamara
2023-03-20 16:15:01 +00:00
parent c408f21d91
commit aa4fd87de1
8 changed files with 9414 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/Navbar.vue
View File

@ -8,6 +8,7 @@
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
@ -21,10 +22,9 @@
<a v-if="isLoggedIn" class="nav-link"><router-link to="/account">Account Settings</router-link></a>
</li>
<li class="nav-item">
<a v-if="isLoggedIn" class="nav-link"><router-link style="text-decoration: none; color: black; font-weight: 100;" @click="logout" to="/" class="navlink">Logout</router-link></a>
<a v-if="isLoggedIn" id="logout" class="nav-link"><router-link style="text-decoration: none; color: black; font-weight: 100;" @click="logout" to="/" class="navlink">Logout</router-link></a>
<a v-if="!isLoggedIn" class="nav-link"><router-link to="/signup">Sign Up</router-link></a>
</li>
</ul>
</div>
</div>

10
src/pages/MapPage.vue
View File

@ -201,7 +201,11 @@ export default {
},
getPreferences() {
if (!store.loggedIn) return
if (!store.loggedIn) {
this.loader.hide()
return
}
const functions = getFunctions(app);
let host = window.location.hostname
if (host === '127.0.0.1' || host == 'localhost') {
@ -226,10 +230,12 @@ export default {
this.decideShowStations()
this.decideShowTrains()
this.readyToDisplayMap = true
this.loader.hide()
}
})
.catch((error) => {
this.readyToDisplayMap = true
this.loader.hide()
})
},
@ -416,7 +422,7 @@ export default {
}
store.setInsights(insights);
this.loader.hide()
// this.loader.hide()
// request the user's preferences
this.getPreferences()
})