V3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behaviour**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone16]
+ - OS: [e.g. iOS18]
+ - App Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

VITTY/Assets.xcassets/Icons/Frame 10.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Frame 10.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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()
 }