Added ifdefs

Author: Mikkel Sørensen

Runtime/Editor/NewUI/LootLockerAdminExtension.cs renamed to Runtime/Editor/Editor UI/LootLockerAdminExtension.cs

@@ -1,13 +1,14 @@
+using System;
+using System.Collections.Generic;
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
 using LootLocker;
-
 using LootLocker.Extension;
-using LootLocker.Extension.DataTypes;
 using LootLocker.Extension.Responses;
 
-using UnityEditor;
-
 public class LootLockerAdminExtension : EditorWindow
 {
     [SerializeField]
@@ -46,7 +47,6 @@ public class LootLockerAdminExtension : EditorWindow
 
     private Button popupBtn;
 
-
     private Label infoText;
 
     private Label newApiKeyCancel;
@@ -58,25 +58,16 @@ public class LootLockerAdminExtension : EditorWindow
 
     private Button createApiKeyBtn;
 
-    //Login Flow Start
     private TextField emailField, passwordField;
     private Label signupLink, gettingStartedLink, forgotPasswordLink;
     private Button loginBtn;
-    //Login Flow End
-
-    //MFA Flow Begin
 
     private TextField codeField;
     private Button signInBtn;
     private string mfaKey;
-    //MFA Flow End
-
-    //Game Selector Flow Begin
 
     VisualElement gameSelectorList;
-    //Game Selector Flow End
 
-    //API Key Flow Begin
     VisualElement apiKeyList;
 
     bool isStage = true;
@@ -143,7 +134,7 @@ public void CreateGUI()
 
         if(LootLockerConfig.current.apiKey != null || LootLockerConfig.current.apiKey != "")
         {
-            //activeKey.text = "Active Key: " + LootLockerConfig.current.apiKey;
+            activeKey.text = "Active Key: " + LootLockerConfig.current.apiKey;
         } else
         {
             activeKey.text = "Active Key: Not selected";
@@ -181,8 +172,6 @@ public void CreateGUI()
         popupBtn.clickable.clickedWithEventInfo += ClosePopup;
 
 
-        //Login Flow Start
-
         loginFlow = root.Q<VisualElement>("LoginFlow");
 
         emailField = root.Q<TextField>("EmailField");
@@ -196,7 +185,7 @@ public void CreateGUI()
             }
         });
 
-            signupLink = root.Q <Label>("newUserLink");
+        signupLink = root.Q <Label>("newUserLink");
         gettingStartedLink = root.Q<Label>("gettingStartedLink");
         forgotPasswordLink = root.Q<Label>("forgotPasswordLink");
 
@@ -209,9 +198,6 @@ public void CreateGUI()
         loginBtn.clickable.clicked += Login;
 
         loginFlow.style.display = DisplayStyle.Flex;
-        //Login Flow End
-
-        //MFA Flow Begin
 
         mfaFlow = root.Q<VisualElement>("MFAFlow");
 
@@ -222,20 +208,13 @@ public void CreateGUI()
         signInBtn.clickable.clickedWithEventInfo += SignIn;
 
         mfaFlow.style.display = DisplayStyle.None;
-        //MFA Flow End
-
-
-        //Game Selector Flow Begin
 
         gameSelectorFlow = root.Q<VisualElement>("GameSelectorFlow");
 
         gameSelectorList = root.Q<VisualElement>("GamesList");
 
         gameSelectorFlow.style.display = DisplayStyle.None;
 
-        //Game Selector Flow End
-
-        //API Key Flow Begin
         apiKeyFlow = root.Q<VisualElement>("APIKeyFlow");
 
         apiKeyFlow.style.display = DisplayStyle.None;
@@ -275,8 +254,6 @@ public void CreateGUI()
             newApiKeyWindow.style.display = DisplayStyle.Flex;
         };
 
-        //API Key Flow End
-
         if (StoredUser.current.user != null)
         {
             LootLockerConfig.current.adminToken = EditorPrefs.GetString("LootLocker.AdminToken");
@@ -386,7 +363,6 @@ private void ClosePopup(EventBase e)
         popup.style.display = DisplayStyle.None;
     }
 
-    //Login Flow Start
     public void Login()
     {
 
@@ -432,10 +408,6 @@ public void Login()
         });
     }
 
-    //Login Flow End
-
-    //MFA Flow Start
-
     public void SignIn(EventBase e)
     {
         EditorApplication.update += OnEditorUpdate;
@@ -458,9 +430,7 @@ public void SignIn(EventBase e)
         });
 
     }
-    //MFA Flow End
 
-    //Game Selector Flow Start
     public void CreateGameButtons()
     {
 
@@ -476,21 +446,18 @@ public void CreateGameButtons()
 
     public void GameButtonTemplate(Game game, string orgName)
     {
-        //Parent
         Button button = new Button();
 
         button.style.flexDirection = FlexDirection.Column;
         button.name = game.id.ToString();
 
         button.AddToClassList("gameButton");
 
-        //Game title
         Label gameTitle = new Label();
         gameTitle.text = game.name;
 
         gameTitle.AddToClassList("gameButtonTitle");
 
-        //Org title
         Label gameOrg = new Label();
         gameOrg.text = orgName;
 
@@ -535,11 +502,6 @@ void OnGameSelected(EventBase e)
 
     }
 
-    //Game Selector Flow End
-
-    //API Key Flow Start
-
-
     void CreateNewAPIKey()
     {
 
@@ -635,7 +597,7 @@ void OnAPIKeySelected(EventBase e)
 
         LootLockerConfig.current.apiKey = target.name;
 
-        //activeKey.text = "Active Key: " + LootLockerConfig.current.apiKey;
+        activeKey.text = "Active Key: " + LootLockerConfig.current.apiKey;
         SwapNewSelectedKey();
 
     }
@@ -670,4 +632,4 @@ void Logout()
     }
 
 }
-//#endif
+#endif

Runtime/Editor/NewUI/LootLockerAdminExtension.cs.meta renamed to Runtime/Editor/Editor UI/LootLockerAdminExtension.cs.meta

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-//#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
 namespace LootLocker
 {
     public class LootLockerAdminEndPoints
@@ -17,4 +17,4 @@ public class LootLockerAdminEndPoints
         public static EndPointClass adminExtensionGetUserRole = new EndPointClass("roles/{0}", LootLockerHTTPMethod.GET);
     }
 }
-//#endif
+#endif

Runtime/Editor/NewUI/LootLockerAdminExtension.uss renamed to Runtime/Editor/Editor UI/LootLockerAdminExtension.uss

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-//#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
 using LootLocker.Extension.Requests;
 using LootLocker.Extension.Responses;
 
@@ -92,4 +92,4 @@ public static void GetUserRole(string userId, Action<UserRoleResponse> onComplet
         }
     }
 }
-//#endif
+#endif

Runtime/Editor/NewUI/LootLockerAdminExtension.uss.meta renamed to Runtime/Editor/Editor UI/LootLockerAdminExtension.uss.meta

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-//#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
 using LootLocker.Extension.DataTypes;
 namespace LootLocker.Extension.Requests
 {
@@ -109,4 +109,4 @@ public class KeyResponse : LootLockerResponse
     }
 
 }
-//#endif
+#endif