Merge branch 'Search_page' into 'dev'

Created basic search result page layout

See merge request !22

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

@@ -15,9 +15,10 @@ public class LoggedInController {
     public Button tbar_map;
     public Button tbar_upload;
     public Button main_upload;
+    public Button tbar_searchButton;
 
-    public void switchToSearch(ActionEvent actionEvent) {
-
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        App.setRoot("search_page");
     }
 
     public void switchToExplore(ActionEvent actionEvent) throws IOException {

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

+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+public class SearchPageController {
+    public ImageView tbar_logo;
+    public TextField tbar_search;
+    public Button tbar_map;
+    public Button tbar_upload;
+    public ScrollPane scrollpane;
+    public Button footer_previous_page;
+    public Button footer_next_page;
+    public ImageView tbar_logo1;
+    public TextField tbar_search1;
+    public Button tbar_map1;
+    public Button tbar_upload1;
+
+    public void switchToSearch(ActionEvent actionEvent) {
+
+    }
+
+    public void switchToMain(MouseEvent mouseEvent) {
+
+    }
+
+    public void switchToMap(ActionEvent actionEvent) {
+
+    }
+
+    public void switchToUpload(ActionEvent actionEvent) {
+
+    }
+
+    public void switchToPrevious(ActionEvent actionEvent) {
+
+    }
+
+    public void switchToNext(ActionEvent actionEvent) throws IOException {
+        App.setRoot("search_page_2");
+    }
+}

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

@@ -30,8 +30,8 @@
          </children>
       </HBox>
       <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
-        <content>
-          <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
+         <content>
+            <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
                <children>
                   <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                      <top>
@@ -45,18 +45,18 @@
                      </right>
                      <center>
                         <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
-                          <columnConstraints>
+                           <columnConstraints>
                               <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                          </columnConstraints>
-                          <rowConstraints>
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                              <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                           </columnConstraints>
+                           <rowConstraints>
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                              <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                          </rowConstraints>
+                           </rowConstraints>
                            <children>
                               <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
                               <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="10.0" layoutY="105.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" />
@@ -159,7 +159,7 @@
                      </bottom>
                   </BorderPane>
                </children></AnchorPane>
-        </content>
+         </content>
       </ScrollPane>
    </children>
 </AnchorPane>

src/main/resources/NTNU/IDATT1002/logged-in.fxml

@@ -23,6 +23,7 @@
                   </ImageView>
                   <Pane prefHeight="100.0" prefWidth="343.0" />
                   <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+                  <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
                   <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
                   <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
                   <Pane prefHeight="100.0" prefWidth="174.0" />