Completed iteration 2

This commit is contained in:
Arlo Filley 2022-11-17 12:10:54 +00:00
parent 75a5912cce
commit 4e9fde0bb8
6 changed files with 11 additions and 6 deletions

View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Document</title> <title>TypeFast</title>
<!-- Favicon Files --> <!-- Favicon Files -->
<link rel="apple-touch-icon" sizes="180x180" href="./assets/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="./assets/favicon/apple-touch-icon.png">

View File

@ -4,7 +4,8 @@ class EndScreen {
new Button(0,0,100,30,0,true,"#fff",false,"#000","#000","Sign Up"), 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(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(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")
] ]
} }

View File

@ -57,7 +57,7 @@ class LoginScreen {
new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), 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(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(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 this.activeTextBox = 0

View File

@ -15,7 +15,7 @@ class ProfileScreen {
textSize(100); textSize(100);
textAlign(CENTER, CENTER); textAlign(CENTER, CENTER);
fill("#000"); fill("#000");
text("Profile", 0, 100, windowWidth - 100, 120); text("Profile", 0, 100, windowWidth, 120);
this.buttons[0].draw(); this.buttons[0].draw();
this.buttons[1].draw(); this.buttons[1].draw();
this.buttons[2].draw(); this.buttons[2].draw();

View File

@ -56,7 +56,7 @@ class SignUpScreen {
new Button(110,0,100,30,0,true,"#fff",false,"#000","#000","Login"), 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(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(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 this.activeTextBox = 0

View File

@ -4,7 +4,8 @@ class StartScreen {
new Button(0,0,100,30,0,true,"#fff",false,"#000","#000","Sign Up"), 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(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(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[1].draw();
this.buttons[2].draw(); this.buttons[2].draw();
this.buttons[3].draw(); this.buttons[3].draw();
this.buttons[4].draw();
if (this.buttons[0].isPressed()) { if (this.buttons[0].isPressed()) {
screenManager.setScreen(new SignUpScreen()); screenManager.setScreen(new SignUpScreen());
} else if (this.buttons[1].isPressed()) { } else if (this.buttons[1].isPressed()) {
@ -26,6 +28,8 @@ class StartScreen {
api.logout(); api.logout();
} else if (this.buttons[3].isPressed()) { } else if (this.buttons[3].isPressed()) {
screenManager.setScreen(new ProfileScreen()); screenManager.setScreen(new ProfileScreen());
} else if (this.buttons[4].isPressed()) {
screenManager.setScreen(new TestScreen());
} }
fill("#000"); fill("#000");
text(`${user.username}`, windowWidth-100, 15); text(`${user.username}`, windowWidth-100, 15);