diff --git a/javascript-practice/src/js/main.js b/javascript-practice/src/js/main.js index 626a1f8..851ad8e 100644 --- a/javascript-practice/src/js/main.js +++ b/javascript-practice/src/js/main.js @@ -3,5 +3,6 @@ import App from './app'; // Sure that scripts called after DOM loaded document.addEventListener('DOMContentLoaded', () => { const myApp = new App(); + myApp.start(); }); diff --git a/javascript-practice/src/js/services/commonService.js b/javascript-practice/src/js/services/commonService.js index 55c2415..934e78c 100644 --- a/javascript-practice/src/js/services/commonService.js +++ b/javascript-practice/src/js/services/commonService.js @@ -19,12 +19,14 @@ export default class CommonService { value, ); const result = await timeOutConnect(existUser); + return result; } async save(data, path = this.defaultPath) { this.connectToDb(); const saveUser = this.firebaseService.save(data, path); + await timeOutConnect(saveUser); } @@ -32,7 +34,9 @@ export default class CommonService { this.connectToDb(); const result = await this.firebaseService.getDataFromId(id, path); const data = await timeOutConnect(result); + if (data) return data; + return null; } } diff --git a/javascript-practice/src/js/services/userService.js b/javascript-practice/src/js/services/userService.js index 556fe54..fa4147f 100644 --- a/javascript-practice/src/js/services/userService.js +++ b/javascript-practice/src/js/services/userService.js @@ -15,6 +15,7 @@ export default class UserService extends CommonService { */ saveUser(user) { const pathData = this.defaultPath + User.createIdUser(); + this.save(user, pathData); } @@ -34,9 +35,11 @@ export default class UserService extends CommonService { */ async checkUserExist(email) { const userExist = await this.getUserIdByEmail(email); + if (userExist) { return true; } + return false; } @@ -47,10 +50,13 @@ export default class UserService extends CommonService { */ async getUserByEmail(email) { const id = await this.getUserIdByEmail(email); + if (id) { const user = await this.getDataFromId(id); + return new User(user); } + return null; } diff --git a/javascript-practice/src/js/views/registerView.js b/javascript-practice/src/js/views/registerView.js index 3a26d6b..b0fb0c0 100644 --- a/javascript-practice/src/js/views/registerView.js +++ b/javascript-practice/src/js/views/registerView.js @@ -24,8 +24,10 @@ export default class RegisterView extends CommonLoginRegisterView { if (this.validateForm(account)) { const user = new User(account); + return user; } + return null; }