V3

VITTY/ContentView.swift

@@ -5,40 +5,45 @@
 //  Created by Ananya George on 11/7/21.
 //
 
+
+
 import SwiftUI
 
 struct ContentView: View {
-
-	@State private var communityPageViewModel = CommunityPageViewModel()
-	@State private var suggestedFriendsViewModel = SuggestedFriendsViewModel()
-	@State private var friendRequestViewModel = FriendRequestViewModel()
-	@State private var authViewModel = AuthViewModel()
+    @State private var communityPageViewModel = CommunityPageViewModel()
+    @State private var suggestedFriendsViewModel = SuggestedFriendsViewModel()
+    @State private var friendRequestViewModel = FriendRequestViewModel()
+    @State private var authViewModel = AuthViewModel()
+    @State private var requestViewModel = RequestsViewModel()
+
     @State private var academicsViewModel = AcademicsViewModel()
 
-	var body: some View {
-		Group {
-			if authViewModel.loggedInFirebaseUser != nil {
-				if authViewModel.loggedInBackendUser == nil {
-					InstructionView()
-				}
-				else {
-					HomeView()
-				}
-			}
-			else {
-				LoginView()
-			}
-
-		}
-		.environment(authViewModel)
-		.environment(communityPageViewModel)
-		.environment(suggestedFriendsViewModel)
-		.environment(friendRequestViewModel)
+    var body: some View {
+        Group {
+            // Check if backend user exists first
+            if authViewModel.loggedInBackendUser != nil {
+                HomeView()
+            }
+            // If no backend user but Firebase user exists, show instruction
+            else if authViewModel.loggedInFirebaseUser != nil {
+                InstructionView()
+            }
+            // If neither exists, show login
+            else {
+                LoginView()
+            }
+        }
+        .environment(authViewModel)
+        .environment(communityPageViewModel)
+        .environment(suggestedFriendsViewModel)
+        .environment(friendRequestViewModel)
         .environment(academicsViewModel)
+        .environment(requestViewModel)
+
 
-	}
+    }
 }
 
 #Preview {
-	ContentView()
+    ContentView()
 }

VITTY/VITTY/Academics/VIewModel/AcademicsViewModel.swift

@@ -21,40 +21,5 @@ import Alamofire
            subsystem: Bundle.main.bundleIdentifier!,
            category: String(describing: AcademicsViewModel.self)
        )
-
-//    func createNote(at url: URL, authToken: String, note: CreateNoteModel) {
-//           self.loading = true
-//           
-//           let headers: HTTPHeaders = [
-//               "Authorization": "Bearer \(authToken)",
-//               "Content-Type": "application/json"
-//           ]
-//           
-//           do {
-//               let jsonData = try JSONEncoder().encode(note)
-//               
-//               AF.request(url, method: .post, parameters: nil, encoding: JSONEncoding.default, headers: headers)
-//                   .responseData { response in
-//                       switch response.result {
-//                       case .success:
-//                           DispatchQueue.main.async {
-//                               self.notes.append(note)
-//                               self.loading = false
-//                           }
-//                       case .failure(let error):
-//                           self.logger.error("Error creating note: \(error.localizedDescription)")
-//                           self.error = true
-//                           self.loading = false
-//                       }
-//                   }
-//           } catch {
-//               self.logger.error("Error encoding JSON: \(error)")
-//               self.error = true
-//               self.loading = false
-//           }
-//       }
-
-
-
 
 }