diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java b/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java index 847a6cf7e5f88f0b2a946bcb2703d392f3399f7e..dfbb4f97b04f961422996ca6ffe3083f48506401 100644 --- a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java +++ b/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java @@ -1,4 +1,14 @@ package NTNU.IDATT1002.controllers; +import javafx.scene.control.Button; +import javafx.scene.control.TextField; +import javafx.scene.image.ImageView; + public class LoggedInController { + public TextField tbar_search; + public ImageView tbar_logo; + public Button tbar_explore; + public Button tbar_map; + public Button tbar_upload; + public Button main_upload; } \ No newline at end of file diff --git a/src/main/resources/Images/PlaceholderLogo.png b/src/main/resources/Images/PlaceholderLogo.png new file mode 100644 index 0000000000000000000000000000000000000000..e435f5674645e57fca39ee77bc1cfc2f078f7d4b Binary files /dev/null and b/src/main/resources/Images/PlaceholderLogo.png differ diff --git a/src/main/resources/NTNU/IDATT1002/logged-in.fxml b/src/main/resources/NTNU/IDATT1002/logged-in.fxml index 750d3ec401a162104c5306013b0d3d1e06345545..1a2f56a3f285d1364344cad4e76a86fa07a2f4c7 100644 --- a/src/main/resources/NTNU/IDATT1002/logged-in.fxml +++ b/src/main/resources/NTNU/IDATT1002/logged-in.fxml @@ -1,15 +1,44 @@ <?xml version="1.0" encoding="UTF-8"?> +<?import javafx.scene.control.Button?> +<?import javafx.scene.control.TextField?> <?import javafx.scene.image.Image?> <?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.AnchorPane?> +<?import javafx.scene.layout.HBox?> +<?import javafx.scene.layout.Pane?> +<?import javafx.scene.layout.VBox?> +<?import javafx.scene.text.Font?> -<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.LoggedInController"> +<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.LoggedInController"> <children> - <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="200.0" layoutY="125.0" pickOnBounds="true" preserveRatio="true"> - <image> - <Image url="@../../Images/party.jpg" /> - </image> - </ImageView> + <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> + <children> + <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;"> + <children> + <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true"> + <image> + <Image url="@../../Images/PlaceholderLogo.png" /> + </image> + </ImageView> + <Pane prefHeight="100.0" prefWidth="343.0" /> + <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." /> + <Button fx:id="tbar_explore" mnemonicParsing="false" text="EXPLORE" /> + <Button fx:id="tbar_map" mnemonicParsing="false" text="MAP" /> + <Pane prefHeight="100.0" prefWidth="174.0" /> + <Button fx:id="tbar_upload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" /> + </children> + </HBox> + <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0"> + <children> + <Button fx:id="main_upload" mnemonicParsing="false" text="UPLOAD"> + <font> + <Font size="60.0" /> + </font> + </Button> + </children> + </HBox> + </children> + </VBox> </children> </AnchorPane>