Commit 3a7c6a5f authored by Adam Procter's avatar Adam Procter 💩

Merge branch 'master' into js_library_import

parents 7af19d82 4c8c3018
Pipeline #77 passed with stages
in 4 minutes and 58 seconds
This diff is collapsed.
<template>
<div class="accountsettings">
</div>
<div class="accountsettings">
</div>
</template>
<script>
......
<template>
<section class="register">
<h1>Register</h1>
<input type="text" name="name" placeholder="Name" />
<input type="text" name="email" placeholder="Email" />
<input type="text" name="domain" placeholder="Domain" />
<section class="register">
<h1>Register</h1>
<input type="text" name="name" placeholder="Name" />
<input type="text" name="email" placeholder="Email" />
<input type="text" name="domain" placeholder="Domain" />
<button type="button">Register </button>
</section>
</template>
<script>
......
<template>
<section class="signin">
<h1> Sign in </h1>
<input type="text" name="email" v-model="input.email" placeholder="Email" />
<button type="button" v-on:click="signin()">Sign in</button>
<font-awesome-icon icon="sign-in-alt" size="3x"/>
</section>
<h1>Sign in</h1>
<input type="text" name="email" v-model="input.email" placeholder="Email" />
<button type="button" v-on:click="signin()">Sign in</button>
<font-awesome-icon icon="sign-in-alt" size="3x"/>
</section>
</template>
......@@ -15,32 +14,30 @@
export default {
name: 'signin',
data() {
return {
input: {
email: ""
}
}
return {
input: {
email: ""
}
}
},
props: {
instancename: String,
// account: Object
},
methods: {
signin() {
if(this.input.email != "") {
if(this.input.email == this.$parent.account.email) {
this.$parent.$emit("authenticated", true);
this.$router.replace({ name: "home" });
} else {
alert("The email is incorrect");
}
} else {
alert("A email must be present");
}
}
methods: {
signin() {
if(this.input.email != "") {
if(this.input.email == this.$parent.account.email) {
this.$parent.$emit("authenticated", true);
this.$router.replace({ name: "home" });
} else {
alert("The email is incorrect");
}
} else {
alert("A email must be present");
}
}
}
}
</script>
......
......@@ -5,7 +5,6 @@
</div>
</template>
<script>
......@@ -36,7 +35,6 @@ export default {
// markers: markers
// }, rect_2).setLineColor("#000000");
</script>
<!-- Add "scoped" attribute to limit CSS to this component only -->
......
......@@ -29,7 +29,7 @@ new Vue({
render: h => h(App)
}).$mount('#app')
mounted:{
{
require('@/assets/js/custom')
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment