From fcabfa2ed80d1d22873b7de195d7299d31fb1a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolay=20Schi=C3=B8ll-Johansen?=
<nicolayschiolljohansen@gmail.com>
Date: Mon, 16 Mar 2020 13:39:51 +0100
Subject: [PATCH] Refreshed main page
---
.../controllers/LoggedInController.java | 10 +++++
src/main/resources/Images/PlaceholderLogo.png | Bin 0 -> 5415 bytes
.../resources/NTNU/IDATT1002/logged-in.fxml | 41 +++++++++++++++---
3 files changed, 45 insertions(+), 6 deletions(-)
create mode 100644 src/main/resources/Images/PlaceholderLogo.png
diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java b/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java
index 847a6cf7..dfbb4f97 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
GIT binary patch
literal 5415
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
DCBr({
literal 0
HcmV?d00001
diff --git a/src/main/resources/NTNU/IDATT1002/logged-in.fxml b/src/main/resources/NTNU/IDATT1002/logged-in.fxml
index 750d3ec4..1a2f56a3 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>
--
GitLab