Merge pull request #83 from Siddhant-Patil0203/main

integrated with new routes
UBA-GCOEN · Oct 1, 2023 · 8bca6fd · 8bca6fd
2 parents 4246516 + 8d48d14
commit 8bca6fd
Show file tree

Hide file tree

Showing 17 changed files with 8,232 additions and 4,470 deletions.
diff --git a/Assets/Scenes/Login-2.unity b/Assets/Scenes/Login-2.unity
@@ -1698,7 +1698,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ab51b09136a99b4cb63b43b50e45216, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  apiEndpoint: /userAdmin/signin
+  apiEndpoint: /user/signin
   email: {fileID: 1437832324}
   password: {fileID: 1564137603}
   confirmPassword: {fileID: 0}

diff --git a/Assets/Scenes/Register.unity b/Assets/Scenes/Register.unity
@@ -2001,12 +2001,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ab51b09136a99b4cb63b43b50e45216, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  apiEndpoint: /userAdmin/signup
+  apiEndpoint: /user/signup
   email: {fileID: 244108177}
   password: {fileID: 119755640}
   confirmPassword: {fileID: 822043007}
   serverMsg: {fileID: 1911395496}
-  loader: {fileID: 0}
+  loader: {fileID: 1495411264}
 --- !u!1 &1039589199
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Library/Bee/TundraBuildState.state b/Library/Bee/TundraBuildState.state
diff --git a/Library/Bee/TundraBuildState.state.map b/Library/Bee/TundraBuildState.state.map
diff --git a/Library/Bee/artifacts/1300b0aE.dag/Assembly-CSharp.dll b/Library/Bee/artifacts/1300b0aE.dag/Assembly-CSharp.dll
diff --git a/Library/Bee/artifacts/1300b0aE.dag/Assembly-CSharp.pdb b/Library/Bee/artifacts/1300b0aE.dag/Assembly-CSharp.pdb
diff --git a/Library/Bee/fullprofile.json b/Library/Bee/fullprofile.json
diff --git a/Library/Bee/tundra.digestcache b/Library/Bee/tundra.digestcache
diff --git a/Library/Bee/tundra.log.json b/Library/Bee/tundra.log.json
diff --git a/Library/SceneVisibilityState.asset b/Library/SceneVisibilityState.asset
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
diff --git a/Library/Search/transactions.db b/Library/Search/transactions.db
diff --git a/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json b/Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json
@@ -1 +1 @@
-{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-40724,-40646,-40058,-40014,-39968,-39932,-39578,-39428,-39302,-37568,-37470,-36818,-36768,-36716,-36674,-23832,-23742,-23058,-22976,-22892,-22818,-1244,27128,27164,31580,31626,33820,34378,34648,34930],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["6b33649816b86a94f949f0eee5086425"]}
+{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-45508,-45334,-44852,-42888,-40724,-40646,-40058,-40014,-39968,-39932,-39578,-39428,-39302,-37568,-37470,-36818,-36768,-36716,-36674,-23832,-23742,-23058,-22976,-22892,-22818,-1244,27128,27164,31580,31626,33820,34378,34648,34930,37066,37164,39518],"m_LastClickedInstanceID":40286,"m_OpenSceneGUIDs":["6b33649816b86a94f949f0eee5086425"]}
diff --git a/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json b/Library/StateCache/SceneView/8c/8cd7c613bf844de3b80696e27a479d5e.json
@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":660.1766967773438,"y":909.3195190429688,"z":14.3275146484375},"rotation":{"x":-0.021303704008460046,"y":-0.020396864041686059,"z":0.0004346275527495891,"w":-0.9995675683021545},"size":1039.8583984375,"orthographic":false}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":585.61474609375,"y":1002.2232666015625,"z":21.08056640625},"rotation":{"x":-0.027303533628582956,"y":-0.014397023245692253,"z":0.0003931914106942713,"w":-0.999525785446167},"size":896.566650390625,"orthographic":false}
diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings
@@ -8,6 +8,9 @@ onBoardingDoNotAskAgain = true
 showPackageIndexes = false
 showStatusBar = false
 scopes = {
+	"last_search.3BE40471" = ""
+	"OpenInspectorPreview.3BE40471" = "0"
+	"currentGroup.3BE40471" = "all"
 }
 providers = {
 	adb = {

diff --git a/server/src/api/controllers/user.js b/server/src/api/controllers/user.js
@@ -148,7 +148,7 @@ export const signin = async (req, res) => {
 
           res.status(200).json({
             success: true,
-            result: oldUser,
+            result: oldUser.name,
             token,
             // csrfToken: req.csrfToken,
             msg: "User is logged in successfully"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-40724,-40646,-40058,-40014,-39968,-39932,-39578,-39428,-39302,-37568,-37470,-36818,-36768,-36716,-36674,-23832,-23742,-23058,-22976,-22892,-22818,-1244,27128,27164,31580,31626,33820,34378,34648,34930],"m_LastClickedInstanceID":0,"m_OpenSceneGUIDs":["6b33649816b86a94f949f0eee5086425"]}
		{"m_ScrollY":0.0,"m_ExpandedSceneGameObjectInstanceIDs":[-45508,-45334,-44852,-42888,-40724,-40646,-40058,-40014,-39968,-39932,-39578,-39428,-39302,-37568,-37470,-36818,-36768,-36716,-36674,-23832,-23742,-23058,-22976,-22892,-22818,-1244,27128,27164,31580,31626,33820,34378,34648,34930,37066,37164,39518],"m_LastClickedInstanceID":40286,"m_OpenSceneGUIDs":["6b33649816b86a94f949f0eee5086425"]}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":660.1766967773438,"y":909.3195190429688,"z":14.3275146484375},"rotation":{"x":-0.021303704008460046,"y":-0.020396864041686059,"z":0.0004346275527495891,"w":-0.9995675683021545},"size":1039.8583984375,"orthographic":false}
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"m_AlwaysRefresh":false,"showFog":true,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true,"showVisualEffectGraphs":true,"m_FxEnabled":true},"in2DMode":false,"pivot":{"x":585.61474609375,"y":1002.2232666015625,"z":21.08056640625},"rotation":{"x":-0.027303533628582956,"y":-0.014397023245692253,"z":0.0003931914106942713,"w":-0.999525785446167},"size":896.566650390625,"orthographic":false}