Merge branch 'main' into league-play-refactoring

# Conflicts:
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/main/java/design/persistence/Serializers.java

1 files changed, 14 insertions, 26 deletions

diff --git a/src/main/java/design/controller/userinput/menus/MainMenu.java b/src/main/java/design/controller/userinput/menus/MainMenu.java
index 75ad88f..3f520e4 100644
--- a/src/main/java/design/controller/userinput/menus/MainMenu.java
+++ b/src/main/java/design/controller/userinput/menus/MainMenu.java
@@ -2,7 +2,6 @@ package design.controller.userinput.menus;
 
 import design.controller.userinput.Menu;
 import design.controller.userinput.MenuOption;
-import design.controller.userinput.UndoActions;
 import design.runtime.Session;
 
 import java.util.List;
@@ -15,32 +14,21 @@ public class MainMenu extends Menu {
 
     @Override
     public List<MenuOption> getMenuOptions() {
-        boolean guest = Session.isGuest();
-        if (guest) {
-            return List.of(
-                    new MenuOption("quit", () -> System.exit(0)),
-                    new MenuOption("guest settings...", () -> new UserSettings().present()),
-                    new MenuOption("browse courses...", () -> new SearchMenu().present())
-
-            );
+        List<MenuOption> options = new java.util.ArrayList<>();
+        options.add(new MenuOption("quit", () -> System.exit(0)));
+        if (Session.isGuest()) {
+            options.add(new MenuOption("guest settings...", () -> new UserSettings().present()));
+            options.add(new MenuOption("browse courses...", () -> new SearchMenu().present()));
         } else {
-            return List.of(
-                    new MenuOption("quit", () -> System.exit(0)),
-                    new MenuOption("undo", () -> {
-                        UndoActions.undoWithSave();
-                        this.present();
-                    }),
-                    new MenuOption("redo", () -> {
-                        UndoActions.redoWithSave();
-                        this.present();
-                    }),
-                    new MenuOption("user settings...", () -> new UserSettings().present()),
-                    new MenuOption("manage courses...", () -> new ManageCourses().present()),
-                    new MenuOption("manage clubs...", () -> new ManageClubs().present()),
-                    new MenuOption("statistics...", () -> new StatisticsMenu().present()),
-                    new MenuOption("log round...", () -> new HolePlayMenu().present()),
-                    new MenuOption("League play...", () -> new SelectLeague().present())
-            );
+            options.add(new MenuOption("manage history...", () -> new HistoryMenu().present()));
+            options.add(new MenuOption("user settings...", () -> new UserSettings().present()));
+            options.add(new MenuOption("manage courses...", () -> new ManageCourses().present()));
+            options.add(new MenuOption("manage clubs...", () -> new ManageClubs().present()));
+            options.add(new MenuOption("statistics...", () -> new StatisticsMenu().present()));
+            options.add(new MenuOption("log round...", () -> new HolePlayMenu().present()));
+            options.add(new MenuOption("league play...", () -> new SelectLeague().present()));
+            options.add(new MenuOption("manage data...", () -> new ImportExportMenu().present()));
         }
+        return options;
     }
 }