Merge branch 'Update_toolbars' into 'dev'

Made toolbars uniform

See merge request !48

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

@@ -6,6 +6,7 @@ import javafx.scene.control.Button;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Pane;
 
@@ -24,21 +25,30 @@ public class CreateAlbumController {
     public GridPane image_grid;
     public Button add_images_button;
     public Button create_album_button;
+    public Button tbar_albums;
+    public Button tbar_searchBtn;
 
-    public void switchToSearch(ActionEvent actionEvent) {
-
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        App.setRoot("search");
     }
 
-    public void switchToUpload(ActionEvent actionEvent) {
-
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
     }
 
-    public void switchToMap(ActionEvent actionEvent) {
-
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
     }
 
-    public void switchToExplore(ActionEvent actionEvent) {
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
 
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
     }
 
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -21,6 +21,7 @@ public class Explore {
     public ScrollPane scrollPane;
     public Button footer_previousBtn;
     public Button footer_nextBtn;
+    public Button tbar_albums;
 
     /**
      * Method that changes stage to Main page
@@ -88,4 +89,8 @@ public class Explore {
     public void switchToNext(ActionEvent actionEvent) throws IOException {
         //TODO: Make method that updates content to next "page"
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -20,11 +20,7 @@ public class ExploreAlbumsController {
     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 Button tbar_searchButton;
+    public Button tbar_searchBtn;
     public Button tbar_explore;
     public Text album_amount;
     public ChoiceBox sorted_by_choicebox;
@@ -54,21 +50,22 @@ public class ExploreAlbumsController {
     public Text album_title5;
     public Text album_desc5;
     public Text album_tags5;
+    public Button tbar_albums;
 
-    public void switchToSearch(ActionEvent actionEvent) {
-
+    public void switchToSearch(ActionEvent actionEvent) throws IOException {
+        App.setRoot("search");
     }
 
-    public void switchToMain(MouseEvent mouseEvent) {
-
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
     }
 
-    public void switchToMap(ActionEvent actionEvent) {
-
+    public void switchToMap(ActionEvent actionEvent) throws IOException {
+        App.setRoot("map");
     }
 
-    public void switchToUpload(ActionEvent actionEvent) {
-
+    public void switchToUpload(ActionEvent actionEvent) throws IOException {
+        App.setRoot("upload");
     }
 
     public void switchToPrevious(ActionEvent actionEvent) {
@@ -76,14 +73,18 @@ public class ExploreAlbumsController {
     }
 
     public void switchToNext(ActionEvent actionEvent) throws IOException {
-        App.setRoot("search_page_2");
-    }
 
-    public void switchToCreateAlbum(ActionEvent actionEvent) {
+    }
 
+    public void switchToCreateAlbum(ActionEvent actionEvent) throws IOException {
+        App.setRoot("create_album_page");
     }
 
-    public void switchToExplore(ActionEvent actionEvent) {
+    public void switchToExplore(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore");
+    }
 
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
     }
 }

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

@@ -19,6 +19,7 @@ public class Main {
     public Button tbar_upload;
 
     public Button uploadBtn;
+    public Button tbar_albums;
 
     /**
      * Method that changes stage to Main page
@@ -68,4 +69,8 @@ public class Main {
     public void switchToUpload(ActionEvent actionEvent) throws IOException {
         App.setRoot("upload");
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }
\ No newline at end of file

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

@@ -19,6 +19,7 @@ public class Map {
 
     public TextField search;
     public Button searchBtn;
+    public Button tbar_albums;
 
     /**
      * Method that changes stage to Main page
@@ -76,5 +77,9 @@ public class Map {
     public void MapSearch(ActionEvent actionEvent) {
         //TODO: Make method
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }
 

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

@@ -31,6 +31,7 @@ public class Search implements Initializable {
 
     public Button footer_previousBtn;
     public Button footer_nextBtn;
+    public Button tbar_albums;
 
 
     /**
@@ -110,4 +111,8 @@ public class Search implements Initializable {
     public void switchToNext(ActionEvent actionEvent) throws IOException {
         //TODO: Make method that updates content to next "page"
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -33,6 +33,7 @@ public class Upload {
 
     public Button uploadBtn;
     public Pane drag_drop;
+    public Button tbar_albums;
 
     /**
      * Method that changes stage to Main page
@@ -180,4 +181,8 @@ public class Upload {
     private void switchToUploadedAlbum() throws IOException {
         App.setRoot("uploaded_album");
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -41,6 +41,7 @@ public class UploadedAlbum {
     public ImageView photo_image4;
 
     public Button acceptBtn;
+    public Button tbar_albums;
 
     /**
      * Method that changes stage to Main page
@@ -101,4 +102,8 @@ public class UploadedAlbum {
         //TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to main page
         App.setRoot("main");
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -30,6 +30,7 @@ public class UploadedPhoto implements Initializable {
     public ImageView photo_image;
 
     public Button acceptBtn;
+    public Button tbar_albums;
 
 
     /**
@@ -101,4 +102,8 @@ public class UploadedPhoto implements Initializable {
         //TODO: write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
         App.setRoot("main");
     }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -34,7 +34,8 @@ public class ViewAlbumController {
     public Text picture_title_field;
     public Text picture_tagsField;
     public ImageView main_picture;
-    public Button tbar_searchButton;
+    public Button tbar_searchBtn;
+    public Button tbar_albums;
 
     public void switchToSearch(ActionEvent actionEvent) throws IOException {
         App.setRoot("search_page");
@@ -52,10 +53,6 @@ public class ViewAlbumController {
         App.setRoot("explore_page");
     }
 
-    public void uploadPhoto(ActionEvent actionEvent) throws IOException {
-        App.setRoot("logged-in");
-    }
-
     public void openPopUpPicture(MouseEvent mouseEvent) {
         //write method that opens a pop-up view of the main picture
     }
@@ -95,4 +92,12 @@ public class ViewAlbumController {
     public void createPdf(ActionEvent actionEvent) {
         //write method that generates and downloads a PDF version of the album
     }
+
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

 package NTNU.IDATT1002.controllers;
 
+import NTNU.IDATT1002.App;
 import javafx.event.ActionEvent;
 import javafx.scene.control.Button;
 import javafx.scene.control.TextField;
@@ -8,10 +9,11 @@ import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Pane;
 import javafx.scene.text.Text;
 
+import java.io.IOException;
+
 public class ViewPicture {
     public ImageView tbar_logo;
     public TextField tbar_search;
-    public Button tbar_searchButton;
     public Button tbar_explore;
     public Button tbar_map;
     public Button tbar_upload;
@@ -20,6 +22,8 @@ public class ViewPicture {
     public Text picture_title_field;
     public Text desc_textField;
     public Pane metadata_pane;
+    public Button tbar_searchBtn;
+    public Button tbar_albums;
 
     public void switchToSearch(ActionEvent actionEvent) {
 
@@ -40,4 +44,12 @@ public class ViewPicture {
     public void openPopUpPicture(MouseEvent mouseEvent) {
         //method that opens pop-up of picture
     }
+
+    public void switchToMain(MouseEvent mouseEvent) throws IOException {
+        App.setRoot("main");
+    }
+
+    public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+        App.setRoot("explore_albums");
+    }
 }

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

@@ -15,25 +15,27 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<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.CreateAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.CreateAlbumController">
     <children>
         <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" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
-                        <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" />
-                        <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
-                    </children>
-                </HBox>
+            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+               <children>
+                  <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+                  <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+                  <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+                  <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                  <Pane prefHeight="100.0" prefWidth="174.0" />
+                  <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+               </children>
+            </HBox>
             <AnchorPane prefHeight="991.0" prefWidth="1920.0" style="-fx-background-color: #999999;">
                <children>
                   <Text layoutX="275.0" layoutY="143.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTITLE:">

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

@@ -13,22 +13,23 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" 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.Explore">
+<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Explore">
    <children>
-      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
          <children>
-            <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+            <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
-            <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
-            <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+            <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+            <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+            <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+            <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
             <Pane prefHeight="100.0" prefWidth="174.0" />
-            <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+            <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
          </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">
@@ -153,8 +154,8 @@
                            <children>
                               <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
                                  <children>
-                                    <Button fx:id="footer_previousBtn" onAction="#switchToPrevious" mnemonicParsing="false" text="PREVIOUS" />
-                                    <Button fx:id="footer_nextBtn" onAction="#switchToNext" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" text="NEXT" />
+                                    <Button fx:id="footer_previousBtn" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
+                                    <Button fx:id="footer_nextBtn" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
                                  </children>
                               </HBox>
                            </children></Pane>

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

@@ -18,24 +18,25 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane maxHeight="2148.0" maxWidth="1920.0" 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.ExploreAlbumsController">
+<AnchorPane maxHeight="2148.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbumsController">
     <children>
-        <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
-            <children>
-                <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
-                    <image>
-                        <Image url="@../../Images/PlaceholderLogo.png" />
-                    </image>
-                </ImageView>
-                <Pane prefHeight="100.0" prefWidth="410.0" />
-                <TextField fx:id="tbar_search1" 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" />
+      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+         <children>
+            <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
             <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
-                <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
-                <Pane prefHeight="100.0" prefWidth="174.0" />
-                <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
-            </children>
-        </HBox>
+            <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+            <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+            <Pane prefHeight="100.0" prefWidth="174.0" />
+            <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+         </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">

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

@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 
-<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.Login">
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Login">
    <children>
       <Label text="Login Page" />
       <GridPane hgap="10.0" maxWidth="300.0" prefHeight="90.0" prefWidth="200.0" vgap="10.0">

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

@@ -10,29 +10,30 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<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.Main">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Main">
    <children>
       <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="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <children>
-                  <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+                  <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
-                  <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
-                  <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
+                  <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+                  <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+                  <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+                  <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
                   <Pane prefHeight="100.0" prefWidth="174.0" />
-                  <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+                  <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
                </children>
             </HBox>
             <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
                <children>
-                  <Button fx:id="uploadBtn" onAction="#switchToUpload" mnemonicParsing="false" text="UPLOAD">
+                  <Button fx:id="uploadBtn" mnemonicParsing="false" onAction="#switchToUpload" text="UPLOAD">
                      <font>
                         <Font size="60.0" />
                      </font>

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

@@ -12,26 +12,27 @@
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.web.WebView?>
 
-<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.Map">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Map">
     <children>
         <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="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                    <children>
-                        <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" 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_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
-                        <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
-                        <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
-                        <Pane prefHeight="100.0" prefWidth="174.0" />
-                        <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
-                    </children>
-                </HBox>
+            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+               <children>
+                  <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+                  <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+                  <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+                  <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                  <Pane prefHeight="100.0" prefWidth="174.0" />
+                  <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+               </children>
+            </HBox>
                 <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
                     <children>
                         <TextField fx:id="search" layoutX="626.0" layoutY="70.0" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
@@ -44,7 +45,7 @@
                                 <Font name="System Bold" size="24.0" />
                             </font>
                         </Text>
-                        <Button fx:id="searchBtn" onAction="#MapSearch" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
+                        <Button fx:id="searchBtn" layoutX="1314.0" layoutY="70.0" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
                             <font>
                                 <Font size="18.0" />
                             </font>

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

 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import javafx.collections.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
 
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Search">
+<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Search">
     <children>
-       <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-          <children>
-             <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" 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_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
-             <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
-             <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
-             <Pane prefHeight="100.0" prefWidth="174.0" />
-             <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
-          </children>
-       </HBox>
+      <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+         <children>
+            <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+            <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+            <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+            <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+            <Pane prefHeight="100.0" prefWidth="174.0" />
+            <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+         </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">

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

@@ -14,7 +14,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.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" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SignUp">
     <children>
         <Label text="Sign Up page">
          <font>

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

@@ -9,28 +9,28 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-
 <?import javafx.scene.text.Text?>
-<?import javafx.scene.Cursor?>
-<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.Upload">
+
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Upload">
 <children>
     <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="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                <children>
-                    <ImageView fx:id="tbar_logo" onMouseClicked="#switchToMain" 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_searchBtn" onAction="#switchToSearch" mnemonicParsing="false" text="SEARCH" />
-                    <Button fx:id="tbar_explore" onAction="#switchToExplore" mnemonicParsing="false" text="EXPLORE" />
-                    <Button fx:id="tbar_map" onAction="#switchToMap" mnemonicParsing="false" text="MAP" />
-                    <Pane prefHeight="100.0" prefWidth="174.0" />
-                    <Button fx:id="tbar_upload" onAction="#switchToUpload" mnemonicParsing="false" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
-                </children>
+            <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+               <children>
+                  <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" 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_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+                  <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+                  <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+                  <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+                  <Pane prefHeight="100.0" prefWidth="174.0" />
+                  <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+               </children>
             </HBox>
             <HBox alignment="CENTER" prefHeight="883.0" prefWidth="1791.0">
                 <children>