Browse Source

Fixed Toasts on all necessary components

theflametrooper 8 years ago
parent
commit
c98cf0c410
2 changed files with 9 additions and 7 deletions
  1. 6 6
      frontend/App.vue
  2. 3 1
      frontend/components/User/Show.vue

+ 6 - 6
frontend/App.vue

@@ -45,24 +45,24 @@
 		events: {
 			'register': function () {
 				let { register: { email, username, password } } = this;
-				this.socket.emit('users.register', username, email, password, grecaptcha.getResponse(), (result) => {
-					// Need to somehow execute this on Home.vue
-					// Toast.methods.addToast(`User ${username} has been registered`, 2000);
+				this.socket.emit('users.register', username, email, password, grecaptcha.getResponse(), result => {
+					Toast.methods.addToast(`User ${username} has been registered`, 2000);
 					setTimeout(location.reload(), 2500);
 				});
 			},
 			'login': function () {
 				let { login: { email, password } } = this;
 
-				this.socket.emit('users.login', email, password, (result) => {
+				this.socket.emit('users.login', email, password, result => {
 					console.log(result);
 					if (result.status === 'success') {
 						let date = new Date();
 						date.setTime(new Date().getTime() + (2*365*24*60*60*1000));
 						document.cookie = "SID=" + result.sessionId + "; expires="+ date.toGMTString() +"; path=/";
-						location.reload();
+						Toast.methods.addToast(`You have been successfully logged in`, 2000);
+						setTimeout(location.reload(), 2500);
 					} else {
-						//TODO Error toast
+						Toast.methods.addToast(result.message, 2000);
 					}
 				});
 			}

+ 3 - 1
frontend/components/User/Show.vue

@@ -30,6 +30,8 @@
 </template>
 
 <script>
+	import { Toast } from 'vue-roaster';
+
 	import MainHeader from '../MainHeader.vue';
 	import MainFooter from '../MainFooter.vue';
 
@@ -42,7 +44,7 @@
 		methods: {
 			changeRank(newRank) {
 				console.log(rank);
-				// Toast.methods.addToast(`User ${this.$route.params.username} has been promoted to the rank of ${rank}`, 200000);
+				Toast.methods.addToast(`User ${this.$route.params.username} has been promoted to the rank of ${rank}`, 2000);
 			}
 		},
 		ready: function() {