Merge branch 'main' of https://github.com/yale-swe/f23-here

yale-swe · Nov 4, 2023 · fc76181 · fc76181
2 parents b4d3fc9 + 3d2e7a1
commit fc76181
Show file tree

Hide file tree

Showing 43 changed files with 45 additions and 1,762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 server/.env
 server/node_modules
+app/newHere1/newHere.xcodeproj/xcuserdata/*
+app/newHere1/newHere.xcodeproj/xcshareddata/*
+app/newHere1/newHere.xcodeproj/project.xcworkspace/xcuserdata
diff --git a/app/here/.DS_Store → app/.DS_Store b/app/here/.DS_Store → app/.DS_Store
diff --git a/app/here.xcodeproj/project.pbxproj b/app/here.xcodeproj/project.pbxproj
diff --git a/app/here.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app/here.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/...deproj/project.xcworkspace/xcuserdata/ericwang.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/ericwang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...roj/project.xcworkspace/xcuserdata/lindsaychen.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/lindsaychen.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...eproj/project.xcworkspace/xcuserdata/phucduong.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/phucduong.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/app/here.xcodeproj/xcuserdata/ericwang.xcuserdatad/xcschemes/xcschememanagement.plist b/app/here.xcodeproj/xcuserdata/ericwang.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/app/here.xcodeproj/xcuserdata/lindsaychen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/app/here.xcodeproj/xcuserdata/lindsaychen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
diff --git a/app/here.xcodeproj/xcuserdata/lindsaychen.xcuserdatad/xcschemes/xcschememanagement.plist b/app/here.xcodeproj/xcuserdata/lindsaychen.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/app/here.xcodeproj/xcuserdata/phucduong.xcuserdatad/xcschemes/xcschememanagement.plist b/app/here.xcodeproj/xcuserdata/phucduong.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/app/here/AppDelegate.swift b/app/here/AppDelegate.swift
diff --git a/app/here/Assets.xcassets/AccentColor.colorset/Contents.json b/app/here/Assets.xcassets/AccentColor.colorset/Contents.json
diff --git a/app/here/Assets.xcassets/AppIcon.appiconset/Contents.json b/app/here/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/app/here/Assets.xcassets/Contents.json b/app/here/Assets.xcassets/Contents.json
diff --git a/...ssets/profilePicture.imageset/4A17C929-321F-4D1A-A4DC-8C2E56B7E71A_1_105_c.jpeg b/...ssets/profilePicture.imageset/4A17C929-321F-4D1A-A4DC-8C2E56B7E71A_1_105_c.jpeg
diff --git a/app/here/Assets.xcassets/profilePicture.imageset/Contents.json b/app/here/Assets.xcassets/profilePicture.imageset/Contents.json
diff --git a/app/here/Base.lproj/LaunchScreen.storyboard b/app/here/Base.lproj/LaunchScreen.storyboard
diff --git a/app/here/Base.lproj/Main.storyboard b/app/here/Base.lproj/Main.storyboard
diff --git a/app/here/Bubble.swift b/app/here/Bubble.swift
diff --git a/app/here/CustomARView.swift b/app/here/CustomARView.swift
diff --git a/app/here/CustomARViewRepresentable.swift b/app/here/CustomARViewRepresentable.swift