Merge branch 'main' into import-exportimport-export

# Conflicts:
#	data/personaldb.json
#	src/main/java/design/controller/userinput/menus/MainMenu.java
#	src/main/java/design/persistence/JSONLeagueDatabase.java
#	src/main/java/design/persistence/JSONPersonalDatabase.java
#	src/test/java/design/model/ClubTest.java
#	src/test/java/design/model/GolferTest.java

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/java/design/controller/userinput/menus/SelectUser.java b/src/main/java/design/controller/userinput/menus/SelectUser.java
index 4b7928c..6931a4b 100644
--- a/src/main/java/design/controller/userinput/menus/SelectUser.java
+++ b/src/main/java/design/controller/userinput/menus/SelectUser.java
@@ -6,6 +6,7 @@ import design.controller.userinput.MenuOption;
 import design.model.Golfer;
 import design.runtime.Session;
 import design.persistence.PersonalDatabase;
+import design.model.undo.UndoManager;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,6 +53,12 @@ public class SelectUser extends Menu {
             this.present();
         }));
 
+        opts.add(new MenuOption("<guest login>", () -> {
+            Session.setCurrentGolfer(null);
+            Session.setGuest(true);
+            doAfter.onAction();
+        }));
+
         return opts;
     }
 
@@ -61,6 +68,7 @@ public class SelectUser extends Menu {
         if (g.checkPassword(password)) {
             // Sets user in Session too
             Session.setCurrentGolfer(g);
+            UndoManager.instance().purge();
             System.out.printf("Loaded user: %s%n", g);
             doAfter.onAction();
         } else {