hft-informatik/ubiquitous-computing-geo-timetracking
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '85-implement-default-actions' into 'master'

Browse Source 
Resolve "Implement default actions"

Closes #85

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!66
This commit is contained in:
Tim Zieger 2020-05-25 10:30:45 +00:00
commit 83bd086792
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/App.vue
View File

@ -50,7 +50,7 @@
<!-- Top menu bar -->
<v-app-bar app clipped-left class="main" elevation="10">
<v-app-bar-nav-icon @click.stop="drawer = !drawer" />
<v-img src="./assets/logo.svg" max-height="100%" max-width="100" contain></v-img>
<v-img @click="forward" src="./assets/logo.svg" max-height="100%" max-width="100" contain></v-img>
<v-toolbar-title>Geo Timetracking</v-toolbar-title>
<v-spacer></v-spacer>
@ -160,6 +160,9 @@ export default {
role: sessionStorage.getItem("role")
}),
methods: {
forward() {
this.$router.push("/")
},
signIn(loginData) {
var xhttp = new XMLHttpRequest();

19
frontend/src/views/SignIn.vue
View File

@ -32,7 +32,7 @@
<p id="missing"></p>
</v-card-text>
<div class="text-center mt-3">
<v-btn rounded color="logowhite" outlined dark v-on:click="signin()">Sign In</v-btn>
<v-btn rounded color="logowhite" outlined dark v-on:click="signin()" >Sign In</v-btn>
</div>
</v-col>
<v-col cols="12" md="4" class="main">
@ -112,7 +112,7 @@
<p id="missingR"></p>
</v-card-text>
<div class="text-center mt-n5">
<v-btn color="logowhite" rounded outlined v-on:click="signup()">Sign Up</v-btn>
<v-btn color="logowhite" rounded outlined v-on:click="signup()" >Sign Up</v-btn>
</div>
</v-col>
</v-row>
@ -125,6 +125,7 @@
</template>
<script>
export default {
data: () => ({
step: 1,
@ -168,6 +169,20 @@ export default {
document.getElementById("missingR").innerHTML= "Please fill out all fields";
}
}
},
mounted(){
window.addEventListener('keyup', (e) => {
if (e.keyCode === 13) {
e.preventDefault();
if(this.step==1){
this.signin();
}else{
this.signup();
}
}
});
}
};
</script>