浏览代码

Change all pages to use new navigator.

Lee Morgan 11 月之前
父节点
当前提交
48085139c3

+ 0 - 1
src/views/js/index.js

@@ -17,7 +17,6 @@ const pages = document.querySelector(".page");
 let currentPage;
 
 window.changePage = (page, data)=>{
-    console.log(page);
     console.time("change page");
     currentPage.close();
 

+ 1 - 1
src/views/js/pages/AddMenu.js

@@ -3,7 +3,7 @@ import Elem from "../Elem.js";
 
 export default class AddMenu extends Page{
     constructor(){
-        super("AddMenu", ["back-home"]);
+        super("AddMenu", ["back-home", "logout"]);
 
         this.render();
     }

+ 1 - 7
src/views/js/pages/CreateAccount.js

@@ -5,7 +5,7 @@ import Account from "../data/Account.js";
 
 export default class CreateAccount extends Page{
     constructor(){
-        super("CreateAccount");
+        super("CreateAccount", ["home", "back-addMenu", "logout"]);
 
         this.render();
     }
@@ -54,12 +54,6 @@ export default class CreateAccount extends Page{
             .append(new Elem("button")
                 .text("Create")
             )
-            .append(new Elem("button")
-                .text("Cancel")
-                .type("button")
-                .addClass("cancel")
-                .onclick(()=>{changePage("home")})
-            )
             .appendTo(this.container);
     }
 }

+ 1 - 7
src/views/js/pages/CreateAllowance.js

@@ -3,7 +3,7 @@ import Elem from "../Elem.js";
 
 export default class CreateAllowance extends Page{
     constructor(){
-        super("CreateAllowance");
+        super("CreateAllowance", ["home", "back-addMenu", "logout"]);
 
         this.render();
     }
@@ -92,12 +92,6 @@ export default class CreateAllowance extends Page{
             .append(new Elem("button")
                 .text("Create")
             )
-            .append(new Elem("button")
-                .text("Cancel")
-                .addClass("cancel")
-                .type("button")
-                .onclick(()=>{changePage("home")})
-            )
             .appendTo(this.container);
     }
 }

+ 1 - 7
src/views/js/pages/CreateBill.js

@@ -3,7 +3,7 @@ import Elem from "../Elem.js";
 
 export default class CreateBill extends Page{
     constructor(){
-        super("CreateBill");
+        super("CreateBill", ["home", "back-addMenu", "logout"]);
 
         this.render();
     }
@@ -50,12 +50,6 @@ export default class CreateBill extends Page{
             .append(new Elem("button")
                 .text("Create")
             )
-            .append(new Elem("button")
-                .text("Cancel")
-                .addClass("cancel")
-                .type("button")
-                .onclick(()=>{changePage("home")})
-            )
             .appendTo(this.container);
     }
 }

+ 1 - 7
src/views/js/pages/CreateIncome.js

@@ -3,7 +3,7 @@ import Elem from "../Elem.js";
 
 export default class CreateIncome extends Page{
     constructor(){
-        super("CreateIncome");
+        super("CreateIncome", ["home", "back-addMenu", "logout"]);
 
         this.render();
     }
@@ -49,12 +49,6 @@ export default class CreateIncome extends Page{
             .append(new Elem("button")
                 .text("Create")
             )
-            .append(new Elem("button")
-                .text("Cancel")
-                .addClass("cancel")
-                .type("button")
-                .onclick(()=>{changePage("home")})
-            )
             .appendTo(this.container);
     }
 }

+ 1 - 7
src/views/js/pages/CreateTransaction.js

@@ -4,7 +4,7 @@ import Transaction from "../data/Transaction.js";
 
 export default class CreateTransaction extends Page{
     constructor(){
-        super("CreateTransaction");
+        super("CreateTransaction", ["home", "back-addMenu", "logout"]);
 
         this.render(
             user.account.listIncome(),
@@ -104,12 +104,6 @@ export default class CreateTransaction extends Page{
             .append(new Elem("button")
                 .text("Create")
             )
-            .append(new Elem("button")
-                .text("Cancel")
-                .type("button")
-                .addClass("cancel")
-                .onclick(()=>{changePage("home")})
-            )
             .appendTo(this.container);
 
         for(let i = 0; i < allowances.length; i++){

+ 1 - 2
src/views/js/pages/Login.js

@@ -6,8 +6,7 @@ import Notifier from "../Notifier.js";
 
 export default class Login extends Page{
     constructor(){
-        console.log("wtf mate");
-        super("Login");
+        super("Login", []);
 
         this.render();
     }

+ 1 - 1
src/views/js/pages/Register.js

@@ -5,7 +5,7 @@ import Notifier from "../Notifier.js";
 
 export default class Register extends Page{
     constructor(){
-        super("Register");
+        super("Register", []);
 
         this.render();
     }

+ 3 - 10
src/views/js/pages/ViewMenu.js

@@ -3,19 +3,12 @@ import Elem from "../Elem.js";
 
 export default class ViewMenu extends Page{
     constructor(){
-        super("ViewMenu");
-        const closeSvg = '<svg stroke-width="2.5" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg" color="currentColor"><path d="M6.75827 17.2426L12.0009 12M17.2435 6.75736L12.0009 12M12.0009 12L6.75827 6.75736M12.0009 12L17.2435 17.2426" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>';
+        super("ViewMenu", ["back-home", "logout"]);
 
-        this.render(closeSvg);
+        this.render();
     }
 
-    render(closeSvg){
-        new Elem("button")
-            .innerHtml(closeSvg)
-            .addClass("circleButton")
-            .onclick(()=>{changePage("home")})
-            .appendTo(this.container);
-
+    render(){
         new Elem("button")
             .text("Transactions")
             .addClass("button")

+ 1 - 3
src/views/js/pages/ViewTransactions.js

@@ -4,7 +4,7 @@ import Format from "../Format.js";
 
 export default class ViewTransactions extends Page{
     constructor(){
-        super("ViewTransactions");
+        super("ViewTransactions", ["home", "back-viewMenu", "logout"]);
 
         this.render();
     }
@@ -26,8 +26,6 @@ export default class ViewTransactions extends Page{
     }
 
     render(){
-        new HomeButton(this.container);
-
         new Elem("h1")
             .text(`${user.account.name} transactions`)
             .appendTo(this.container);