Signup fix

src/main/java/NTNU/IDATT1002/controllers/SignUp.java

@@ -100,4 +100,8 @@ public class SignUp {
             }
         }
     }
+
+    public void cancel(ActionEvent event) throws IOException {
+        App.setRoot("login");
+    }
 }

src/main/resources/NTNU/IDATT1002/signup.fxml

@@ -5,13 +5,17 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
+<<<<<<< src/main/resources/NTNU/IDATT1002/signup.fxml
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
+=======
 <VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
+>>>>>>> src/main/resources/NTNU/IDATT1002/signup.fxml
     <children>
         <Label text="Sign Up page">
          <font>
             <Font size="14.0" />
          </font></Label>
-      <GridPane fx:id="signup_form" hgap="10.0" maxWidth="-Infinity" prefHeight="229.0" prefWidth="348.0" vgap="10.0">
+      <GridPane fx:id="signup_form" hgap="10.0" maxWidth="-Infinity" prefHeight="229.0" prefWidth="400.0" vgap="10.0">
         <columnConstraints>
           <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="10.0" prefWidth="80.0" />
           <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -33,7 +37,7 @@
             <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
             <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Phone:" GridPane.halignment="RIGHT" GridPane.rowIndex="5" />
             <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Birth date:" GridPane.halignment="RIGHT" GridPane.rowIndex="6" />
-            <TextField fx:id="signup_firstName" GridPane.columnIndex="1" />
+            <TextField fx:id="signup_firstName" prefHeight="25.0" prefWidth="248.0" GridPane.columnIndex="1" />
             <TextField fx:id="signup_lastName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <TextField fx:id="signup_username" GridPane.columnIndex="1" GridPane.rowIndex="2" />
             <TextField fx:id="signup_email" GridPane.columnIndex="1" GridPane.rowIndex="3" />
@@ -44,14 +48,20 @@
                   <TextField fx:id="signup_phoneNr" prefWidth="242.0" promptText="Phone number" />
                </children>
             </HBox>
-            <DatePicker fx:id="signup_birthDate" GridPane.columnIndex="1" GridPane.rowIndex="6" />
+            <DatePicker fx:id="signup_birthDate" prefHeight="25.0" prefWidth="304.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
          </children>
          <padding>
             <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
          </padding>
       </GridPane>
-      <Text fx:id="signup_error" strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="170.13671875" />
-        <Button fx:id="signup_btn" onAction="#signup" prefHeight="26.0" prefWidth="57.0" text="Sign up" />
+      <HBox alignment="CENTER" spacing="10.0">
+         <children>
+            <Button fx:id="cancelBtn" layoutX="10.0" layoutY="10.0" onAction="#cancel" prefHeight="26.0" prefWidth="85.0" text="Cancel" />
+            <Text fx:id="signup_error" strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="170.13671875" />
+              <Button fx:id="signup_btn" onAction="#signup" prefHeight="26.0" prefWidth="85.0" text="Sign up" />
+         </children>
+      </HBox>
+
     </children>
     <padding>
         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />