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

Merge branch 'main' into insightsRevamp

Browse Source
This commit is contained in:
Conor McNamara
2023-03-20 20:25:26 +00:00
committed by GitHub
parent 33e694482b 8fc21f4a01
commit 5f2b98d2c8
8 changed files with 9463 additions and 32 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>

77
src/pages/MapPage.vue
View File

@ -8,44 +8,57 @@
<div style="padding-bottom: 7px;" id="dropMenu" class="dropdown-menu" aria-labelledby="dropdownMenuButton1" v-on:click.stop="handleClick">
<div id="prefHeader">STATIONS</div>
<div class="container-fluid" @change="decideShowStations();">
<div class="form-check form-switch">
<input @change="selectAllStations();" class="form-check-input" type="checkbox" role="switch" id="showAllStations" v-model="showAllStations"/>
<label class="form-check-label" for="showAllStations">All Stations</label>
</div>
<hr/>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showMainlandStations" v-model="showMainlandStations"/>
<label class="form-check-label" for="showMainlandStations">Mainline Stations</label>
<label class="form-check-label" for="showMainlandStations">Mainline</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showDARTStations" v-model="showDARTStations"/>
<label class="form-check-label" for="showDARTStations">DART Stations</label>
<label class="form-check-label" for="showDARTStations">DART</label>
</div>
</div>
<hr/>
<div id="prefHeader">TRAINS</div>
<div class="container-fluid" @change="decideShowTrains();">
<div class="form-check form-switch">
<input @change="selectAllTrains();" class="form-check-input" type="checkbox" role="switch" id="showAllTrains" v-model="showAllTrains"/>
<label class="form-check-label" for="showAllTrains">All Trains</label>
</div>
<hr/>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showMainland" v-model="showMainland"/>
<label class="form-check-label" for="showMainland">Mainline Trains</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showLate" v-model="showLate"/>
<label class="form-check-label" for="showLate">Late Trains</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showOnTime" v-model="showOnTime"/>
<label class="form-check-label" for="showOnTime">On-time Trains</label>
<label class="form-check-label" for="showMainland">Mainline</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showDART" v-model="showDART"/>
<label class="form-check-label" for="showDART">DARTs</label>
</div>
<hr/>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showOnTime" v-model="showOnTime"/>
<label class="form-check-label" for="showOnTime">On-Time</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showLate" v-model="showLate"/>
<label class="form-check-label" for="showLate">Late</label>
</div>
<hr/>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showNotYetRunning" v-model="showNotYetRunning"/>
<label class="form-check-label" for="showNotYetRunning">Not-Yet Running</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showRunning" v-model="showRunning"/>
<label class="form-check-label" for="showRunning">Running Trains</label>
<label class="form-check-label" for="showRunning">Running</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showTerminated" v-model="showTerminated"/>
<label class="form-check-label" for="showTerminated">Terminated Trains</label>
</div>
<div class="form-check form-switch">
<input class="form-check-input" type="checkbox" role="switch" id="showNotYetRunning" v-model="showNotYetRunning"/>
<label class="form-check-label" for="showNotYetRunning">Not-yet Running Trains</label>
<label class="form-check-label" for="showTerminated">Terminated</label>
</div>
</div>
<button id="savePref" class="btn btn-outline-info" v-if="store.loggedIn" @click="postPreferences()">Save Preferences</button>
@ -157,8 +170,10 @@ export default {
toast,
loader,
showAllStations: true,
showMainlandStations: true,
showDARTStations: true,
showAllTrains: true,
showLate: true,
showOnTime: true,
showMainland: true,
@ -201,7 +216,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 +245,12 @@ export default {
this.decideShowStations()
this.decideShowTrains()
this.readyToDisplayMap = true
this.loader.hide()
}
})
.catch((error) => {
this.readyToDisplayMap = true
this.loader.hide()
})
},
@ -289,6 +310,23 @@ export default {
}
},
// method to select all stations
selectAllStations() {
this.showDARTStations = this.showAllStations;
this.showMainlandStations = this.showAllStations;
},
// method to select all trains
selectAllTrains() {
this.showLate = this.showAllTrains;
this.showOnTime = this.showAllTrains;
this.showMainland = this.showAllTrains;
this.showDART = this.showAllTrains;
this.showRunning = this.showAllTrains;
this.showTerminated = this.showAllTrains;
this.showNotYetRunning = this.showAllTrains;
},
// method to display a selected train
getSelectedTrain(i) {
store.setSelectedTrain(this.allTrains[i]);
@ -416,7 +454,7 @@ export default {
}
store.setInsights(insights);
this.loader.hide()
// this.loader.hide()
// request the user's preferences
this.getPreferences()
})
@ -569,6 +607,5 @@ export default {
left:5%;
top: 18%;
}
}
</style>