Заменил innerHTML на .remove() при удалении страницы

frontend-park-mail-ru · Feb 29, 2024 · d82c52c · d82c52c
1 parent ae052c7
commit d82c52c
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/public/build/login.js b/public/build/login.js
diff --git a/public/build/register.js b/public/build/register.js
diff --git a/public/config.js b/public/config.js
@@ -60,6 +60,7 @@ const profilePage = {
 }
 
 const loginPage = {
+    id: "login-page",
     href: "/login",
     form: {
         id: "login-form",
@@ -91,6 +92,7 @@ const loginPage = {
 
 const registerPage = {
     href: "/register",
+    id: "register-page",
     form: {
         id: "register-form",
         inputs: {

diff --git a/public/src/pages/login/login.hbs b/public/src/pages/login/login.hbs
@@ -1,5 +1,5 @@
-<div class="login-form-wrapper">
-	<form class="login-form" id="{{id}}">
+<div class="login-form-wrapper" id="{{id}}">
+	<form class="login-form" id="login-form">
 		<h2 class="login-title">Форма входа</h2>
 	</form>
 </div>
diff --git a/public/src/pages/login/login.js b/public/src/pages/login/login.js
@@ -31,6 +31,10 @@ export default class LoginPage {
         return document.getElementById(this.#config.form.id)
     }
 
+    get self () {
+        return document.getElementById(this.#config.id)
+    }
+
     validateData = () => {
         const validateLogin = this.#validateLogin()
         const validatePassword = this.#validatePassword()
@@ -102,15 +106,15 @@ export default class LoginPage {
         this.#submitBtn.remove();
         this.#passwordInput.remove();
         this.#loginInput.remove();
-        this.#parent.innerHTML = '';
+        this.self.remove()
     }
 
     render() {
         console.log("loginPage render")
 
         this.#parent.insertAdjacentHTML(
             'beforeend',
-            window.Handlebars.templates['login.hbs'](this.#config.form)
+            window.Handlebars.templates['login.hbs'](this.#config)
         );
 
         this.#loginInput = new Input(this.form, this.#config.form.inputs.login);

diff --git a/public/src/pages/main/main.js b/public/src/pages/main/main.js
@@ -22,7 +22,7 @@ export default class Main {
 
   remove(){
     console.log("Main remove")
-    this.#parent.innerHTML = '';
+    this.self.remove()
   }
 
   render() {

diff --git a/public/src/pages/notFound/not-found.js b/public/src/pages/notFound/not-found.js
@@ -20,7 +20,7 @@ export default class NotFoundPage {
     }
 
     remove() {
-        this.#parent.innerHTML = '';
+        this.self.remove()
     }
 
     handleButtonClick = () => {

diff --git a/public/src/pages/profile/profile.js b/public/src/pages/profile/profile.js
@@ -26,7 +26,7 @@ export default class ProfilePage {
     }
 
     remove(){
-        this.#parent.innerHTML = '';
+        this.self.remove()
     }
 
     handleLogout() {

diff --git a/public/src/pages/register/register.hbs b/public/src/pages/register/register.hbs
@@ -1,4 +1,4 @@
-<div class="register-form-wrapper">
+<div class="register-form-wrapper" id="register-page">
 	<form class="register-form" id="{{id}}">
 		<h2 class="register-title">Форма регистрации</h2>
 	</form>

diff --git a/public/src/pages/register/register.js b/public/src/pages/register/register.js
@@ -32,6 +32,10 @@ export default class RegisterPage {
         return document.getElementById(this.#config.form.id)
     }
 
+    get self () {
+        return document.getElementById(this.#config.id)
+    }
+
     validateData = () => {
         const validateLogin = this.#validateLogin()
         const validatePassword = this.#validatePassword()
@@ -113,8 +117,8 @@ export default class RegisterPage {
     }
 
     remove(){
-        this.#parent.innerHTML = '';
         this.#unsubscribeToEvents();
+        this.self.remove()
     }
 
     render() {