From 4e9fde0bb85d3077a710a9595d681388c2f089d1 Mon Sep 17 00:00:00 2001 From: Arlo Filley Date: Thu, 17 Nov 2022 12:10:54 +0000 Subject: [PATCH] Completed iteration 2 --- website/index.html | 2 +- website/screens/endscreen.js | 3 ++- website/screens/loginscreen.js | 2 +- website/screens/profilescreen.js | 2 +- website/screens/signUpScreen.js | 2 +- website/screens/startscreen.js | 6 +++++- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/website/index.html b/website/index.html index dfdbb45..e856064 100644 --- a/website/index.html +++ b/website/index.html @@ -4,7 +4,7 @@ - Document + TypeFast diff --git a/website/screens/endscreen.js b/website/screens/endscreen.js index 95131fa..8515b8e 100644 --- a/website/screens/endscreen.js +++ b/website/screens/endscreen.js @@ -4,7 +4,8 @@ class EndScreen { new Button(0,0,100,30,0,true,"#fff",false,"#000","#000","Sign Up"), new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), new Button(220,0,100,30,0,true,"#fff",false,"#000","#000","Logout"), - new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile") + new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile"), + new Button(440,0,100,30,0,true,"#fff",false,"#000","#000","Test") ] } diff --git a/website/screens/loginscreen.js b/website/screens/loginscreen.js index c86ab12..b1c2648 100644 --- a/website/screens/loginscreen.js +++ b/website/screens/loginscreen.js @@ -57,7 +57,7 @@ class LoginScreen { new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), new Button(220,0,100,30,0,true,"#fff",false,"#000","#000","Logout"), new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile"), - new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Test"), + new Button(440,0,100,30,0,true,"#fff",false,"#000","#000","Test"), ] this.activeTextBox = 0 diff --git a/website/screens/profilescreen.js b/website/screens/profilescreen.js index 5e91938..e82ffce 100644 --- a/website/screens/profilescreen.js +++ b/website/screens/profilescreen.js @@ -15,7 +15,7 @@ class ProfileScreen { textSize(100); textAlign(CENTER, CENTER); fill("#000"); - text("Profile", 0, 100, windowWidth - 100, 120); + text("Profile", 0, 100, windowWidth, 120); this.buttons[0].draw(); this.buttons[1].draw(); this.buttons[2].draw(); diff --git a/website/screens/signUpScreen.js b/website/screens/signUpScreen.js index 536a286..be5f900 100644 --- a/website/screens/signUpScreen.js +++ b/website/screens/signUpScreen.js @@ -56,7 +56,7 @@ class SignUpScreen { new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), new Button(220,0,100,30,0,true,"#fff",false,"#000","#000","Logout"), new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile"), - new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Test"), + new Button(440,0,100,30,0,true,"#fff",false,"#000","#000","Test"), ] this.activeTextBox = 0 diff --git a/website/screens/startscreen.js b/website/screens/startscreen.js index 3fd9cb5..ec821a0 100644 --- a/website/screens/startscreen.js +++ b/website/screens/startscreen.js @@ -4,7 +4,8 @@ class StartScreen { new Button(0,0,100,30,0,true,"#fff",false,"#000","#000","Sign Up"), new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), new Button(220,0,100,30,0,true,"#fff",false,"#000","#000","Logout"), - new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile") + new Button(330,0,100,30,0,true,"#fff",false,"#000","#000","Profile"), + new Button(440,0,100,30,0,true,"#fff",false,"#000","#000","Test"), ] } @@ -18,6 +19,7 @@ class StartScreen { this.buttons[1].draw(); this.buttons[2].draw(); this.buttons[3].draw(); + this.buttons[4].draw(); if (this.buttons[0].isPressed()) { screenManager.setScreen(new SignUpScreen()); } else if (this.buttons[1].isPressed()) { @@ -26,6 +28,8 @@ class StartScreen { api.logout(); } else if (this.buttons[3].isPressed()) { screenManager.setScreen(new ProfileScreen()); + } else if (this.buttons[4].isPressed()) { + screenManager.setScreen(new TestScreen()); } fill("#000"); text(`${user.username}`, windowWidth-100, 15);