From 656adb73a2258edf531ec42a6670350affd59472 Mon Sep 17 00:00:00 2001
From: insung0927 <78968690+insung0927@users.noreply.github.com>
Date: Wed, 8 Feb 2023 13:26:16 +0900
Subject: [PATCH 1/4] 2/8

---
 .DS_Store                                     | Bin 6148 -> 8196 bytes
 Better-me-iOS.xcodeproj/project.pbxproj       | 108 ++
 Better-me-iOS/.DS_Store                       | Bin 6148 -> 6148 bytes
 Better-me-iOS/Assets.xcassets/.DS_Store       | Bin 0 -> 12292 bytes
 .../BetterMe.imageset/Contents.json           |  21 +
 .../BetterMe.imageset/image 6.png             | Bin 0 -> 3082 bytes
 .../Group 44.imageset/Contents.json           |  21 +
 .../Group 44.imageset/Group 44.png            | Bin 0 -> 367 bytes
 .../Group 65.imageset/Contents.json           |  21 +
 .../Group 65.imageset/Group 65.png            | Bin 0 -> 1094 bytes
 .../Magnifier.imageset/Contents.json          |  21 +
 .../Magnifier.imageset/Magnifier.png          | Bin 0 -> 539 bytes
 .../so-trash.imageset/Contents.json           |  21 +
 .../so-trash.imageset/so-trash.png            | Bin 0 -> 428 bytes
 Better-me-iOS/Base.lproj/Main.storyboard      |  41 +-
 Better-me-iOS/HomeViewController.swift        |   1 +
 Better-me-iOS/Social/Data/FriendSearch.swift  |  33 +
 .../Social/Data/FriendSearchModel.swift       |  42 +
 Better-me-iOS/Social/Data/InviteHabit.swift   |  24 +
 .../Social/Data/InviteHabitModel.swift        |  38 +
 Better-me-iOS/Social/Data/NewPerson.swift     |  36 +
 .../Social/Data/NewPersonModel.swift          |  44 +
 Better-me-iOS/Social/Data/Person.swift        |  18 +
 Better-me-iOS/Social/Data/PersonModel.swift   |  35 +
 .../Social/Data/Request_Friend.swift          |  24 +
 .../Social/Data/Request_FriendModel.swift     |  38 +
 .../Social/SocialViewController.swift         |  40 +
 Better-me-iOS/Social/SwiftUIView.swift        | 931 ++++++++++++++++++
 28 files changed, 1549 insertions(+), 9 deletions(-)
 create mode 100644 Better-me-iOS/Assets.xcassets/.DS_Store
 create mode 100644 Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png
 create mode 100644 Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png
 create mode 100644 Better-me-iOS/Social/Data/FriendSearch.swift
 create mode 100644 Better-me-iOS/Social/Data/FriendSearchModel.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabit.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabitModel.swift
 create mode 100644 Better-me-iOS/Social/Data/NewPerson.swift
 create mode 100644 Better-me-iOS/Social/Data/NewPersonModel.swift
 create mode 100644 Better-me-iOS/Social/Data/Person.swift
 create mode 100644 Better-me-iOS/Social/Data/PersonModel.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_Friend.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_FriendModel.swift
 create mode 100644 Better-me-iOS/Social/SocialViewController.swift
 create mode 100644 Better-me-iOS/Social/SwiftUIView.swift

diff --git a/.DS_Store b/.DS_Store
index 62cf7e099dcfe0f2f963475245489bd895666747..09febd5def09640f72d9342b976426a176382ca5 100644
GIT binary patch
delta 379
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7-OXH}hr%jz7$c**Q2SHn1=X
zPv&9Ku4iG;V@PMnWGKl=Hw;eB&n*CIVqo}m{tu9Z%jM>~xFqG|CjrGc@{ddCKR<rN
z5mi0~uY5rUlG)z{fLa;2AogyyW9ecPK(U*n?a1U+ta2jAmflv#H3nG<l|a~rEWwXr
z4ex@<3t8kRpJ1KI%%Y<^`2(Ag5VDDuz4AbBOn%2^GWiZ04;!58$i%W?b0*JHW-bYC
ipfg=TLAY6v<2&<Yei6^f{yZEUjF8Y}*c{I@hZz8e9AnG?

delta 147
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jH4hU^g=(_hcRc?ak{2CNfSE
zp2^JkihuGPVLP_vKYt2y?3w&P*a5*bnH(j;%f#d`vGCerb`B0fW}sm}AixbITtVh;
bEd0(qnP0{eWD5fm#72-K7&gcA%wYxq8TKJy

diff --git a/Better-me-iOS.xcodeproj/project.pbxproj b/Better-me-iOS.xcodeproj/project.pbxproj
index fcd6f5a..b54845a 100644
--- a/Better-me-iOS.xcodeproj/project.pbxproj
+++ b/Better-me-iOS.xcodeproj/project.pbxproj
@@ -12,6 +12,20 @@
 		280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E572983B25F000A30B3 /* MyPageCell.swift */; };
 		280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E582983B25F000A30B3 /* ProfileEditController.swift */; };
 		280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E592983B25F000A30B3 /* PWEditController.swift */; };
+		3B7049E2298FCE3C0054096A /* InviteHabit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DA298FCE3C0054096A /* InviteHabit.swift */; };
+		3B7049E3298FCE3C0054096A /* FriendSearchModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DB298FCE3C0054096A /* FriendSearchModel.swift */; };
+		3B7049E4298FCE3C0054096A /* Request_Friend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DC298FCE3C0054096A /* Request_Friend.swift */; };
+		3B7049E5298FCE3C0054096A /* Request_FriendModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DD298FCE3C0054096A /* Request_FriendModel.swift */; };
+		3B7049E6298FCE3C0054096A /* NewPerson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DE298FCE3C0054096A /* NewPerson.swift */; };
+		3B7049E7298FCE3C0054096A /* FriendSearch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049DF298FCE3C0054096A /* FriendSearch.swift */; };
+		3B7049E8298FCE3C0054096A /* InviteHabitModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049E0298FCE3C0054096A /* InviteHabitModel.swift */; };
+		3B7049E9298FCE3C0054096A /* NewPersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049E1298FCE3C0054096A /* NewPersonModel.swift */; };
+		3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EA298FCE5E0054096A /* PersonModel.swift */; };
+		3B7049ED298FCE5E0054096A /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EB298FCE5E0054096A /* Person.swift */; };
+		3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 3B9BDE05298FC40000CC0C45 /* Alamofire */; };
+		3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */; };
+		3BA12295298A967B000E38A8 /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = 3BA12294298A967B000E38A8 /* PopupView */; };
+		3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */; };
 		BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE26CD07297805A900E97A05 /* AlertViewController.swift */; };
 		BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */; };
 		BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */; };
@@ -39,6 +53,18 @@
 		280F5E572983B25F000A30B3 /* MyPageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageCell.swift; sourceTree = "<group>"; };
 		280F5E582983B25F000A30B3 /* ProfileEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileEditController.swift; sourceTree = "<group>"; };
 		280F5E592983B25F000A30B3 /* PWEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PWEditController.swift; sourceTree = "<group>"; };
+		3B7049DA298FCE3C0054096A /* InviteHabit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabit.swift; sourceTree = "<group>"; };
+		3B7049DB298FCE3C0054096A /* FriendSearchModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendSearchModel.swift; sourceTree = "<group>"; };
+		3B7049DC298FCE3C0054096A /* Request_Friend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend.swift; sourceTree = "<group>"; };
+		3B7049DD298FCE3C0054096A /* Request_FriendModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_FriendModel.swift; sourceTree = "<group>"; };
+		3B7049DE298FCE3C0054096A /* NewPerson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPerson.swift; sourceTree = "<group>"; };
+		3B7049DF298FCE3C0054096A /* FriendSearch.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendSearch.swift; sourceTree = "<group>"; };
+		3B7049E0298FCE3C0054096A /* InviteHabitModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitModel.swift; sourceTree = "<group>"; };
+		3B7049E1298FCE3C0054096A /* NewPersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPersonModel.swift; sourceTree = "<group>"; };
+		3B7049EA298FCE5E0054096A /* PersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonModel.swift; sourceTree = "<group>"; };
+		3B7049EB298FCE5E0054096A /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
+		3BA12291298A94EA000E38A8 /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
+		3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialViewController.swift; sourceTree = "<group>"; };
 		BE26CD07297805A900E97A05 /* AlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewController.swift; sourceTree = "<group>"; };
 		BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadHabitDetailViewController.swift; sourceTree = "<group>"; };
 		BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveBadHabitViewController.swift; sourceTree = "<group>"; };
@@ -67,6 +93,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3BA12295298A967B000E38A8 /* PopupView in Frameworks */,
+				3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,6 +113,33 @@
 			path = MyPage;
 			sourceTree = "<group>";
 		};
+		3B9BDDF3298FC2EA00CC0C45 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				3B7049EB298FCE5E0054096A /* Person.swift */,
+				3B7049EA298FCE5E0054096A /* PersonModel.swift */,
+				3B7049DF298FCE3C0054096A /* FriendSearch.swift */,
+				3B7049DB298FCE3C0054096A /* FriendSearchModel.swift */,
+				3B7049DA298FCE3C0054096A /* InviteHabit.swift */,
+				3B7049E0298FCE3C0054096A /* InviteHabitModel.swift */,
+				3B7049DE298FCE3C0054096A /* NewPerson.swift */,
+				3B7049E1298FCE3C0054096A /* NewPersonModel.swift */,
+				3B7049DC298FCE3C0054096A /* Request_Friend.swift */,
+				3B7049DD298FCE3C0054096A /* Request_FriendModel.swift */,
+			);
+			path = Data;
+			sourceTree = "<group>";
+		};
+		3BA12278298A9340000E38A8 /* Social */ = {
+			isa = PBXGroup;
+			children = (
+				3B9BDDF3298FC2EA00CC0C45 /* Data */,
+				3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */,
+				3BA12291298A94EA000E38A8 /* SwiftUIView.swift */,
+			);
+			path = Social;
+			sourceTree = "<group>";
+		};
 		BECC4B2C296C3AB60037807F = {
 			isa = PBXGroup;
 			children = (
@@ -124,6 +179,7 @@
 				BEF940BD2972827900D0F1FD /* Habit.swift */,
 				BEF940C1297561FB00D0F1FD /* BadHabitCell.swift */,
 				BE26CD07297805A900E97A05 /* AlertViewController.swift */,
+				3BA12278298A9340000E38A8 /* Social */,
 				280F5E542983B23A000A30B3 /* MyPage */,
 			);
 			path = "Better-me-iOS";
@@ -145,6 +201,10 @@
 			dependencies = (
 			);
 			name = "Better-me-iOS";
+			packageProductDependencies = (
+				3BA12294298A967B000E38A8 /* PopupView */,
+				3B9BDE05298FC40000CC0C45 /* Alamofire */,
+			);
 			productName = "Better-me-iOS";
 			productReference = BECC4B35296C3AB60037807F /* Better-me-iOS.app */;
 			productType = "com.apple.product-type.application";
@@ -173,6 +233,10 @@
 				Base,
 			);
 			mainGroup = BECC4B2C296C3AB60037807F;
+			packageReferences = (
+				3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */,
+				3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */,
+			);
 			productRefGroup = BECC4B36296C3AB60037807F /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -202,25 +266,37 @@
 			files = (
 				BE5F4EC6296E7CC90064A93C /* SearchFriendViewController.swift in Sources */,
 				280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */,
+				3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */,
+				3B7049E4298FCE3C0054096A /* Request_Friend.swift in Sources */,
 				280F5E5B2983B25F000A30B3 /* MyPageViewController.swift in Sources */,
 				280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */,
 				BEF940C029753F8500D0F1FD /* GoodHabitDetailViewController.swift in Sources */,
 				BECC4B4D296C3E1F0037807F /* AddGoodHabitViewController.swift in Sources */,
+				3B7049E9298FCE3C0054096A /* NewPersonModel.swift in Sources */,
 				280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */,
 				BECC4B3D296C3AB60037807F /* HomeViewController.swift in Sources */,
 				BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */,
 				BECC4B39296C3AB60037807F /* AppDelegate.swift in Sources */,
 				280F5E5A2983B25F000A30B3 /* HeaderView.swift in Sources */,
+				3B7049E5298FCE3C0054096A /* Request_FriendModel.swift in Sources */,
+				3B7049ED298FCE5E0054096A /* Person.swift in Sources */,
+				3B7049E3298FCE3C0054096A /* FriendSearchModel.swift in Sources */,
+				3B7049E8298FCE3C0054096A /* InviteHabitModel.swift in Sources */,
 				BEF940BC29727FC600D0F1FD /* GoodHabitCell.swift in Sources */,
+				3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */,
 				BE6AF7F0296ED4EF00C236F8 /* FriendCell.swift in Sources */,
+				3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */,
 				BEF940BE2972827900D0F1FD /* Habit.swift in Sources */,
 				BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */,
 				BECC4B3B296C3AB60037807F /* SceneDelegate.swift in Sources */,
 				BEF940C2297561FB00D0F1FD /* BadHabitCell.swift in Sources */,
+				3B7049E2298FCE3C0054096A /* InviteHabit.swift in Sources */,
 				BE6AF7F2296ED62400C236F8 /* Friend.swift in Sources */,
 				BE5F4EC4296D9E090064A93C /* Quote.swift in Sources */,
 				BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */,
 				BECC4B62296C6B010037807F /* EmojiTextField.swift in Sources */,
+				3B7049E7298FCE3C0054096A /* FriendSearch.swift in Sources */,
+				3B7049E6298FCE3C0054096A /* NewPerson.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -438,6 +514,38 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Alamofire/Alamofire.git";
+			requirement = {
+				branch = master;
+				kind = branch;
+			};
+		};
+		3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/exyte/PopupView.git";
+			requirement = {
+				branch = master;
+				kind = branch;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		3B9BDE05298FC40000CC0C45 /* Alamofire */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */;
+			productName = Alamofire;
+		};
+		3BA12294298A967B000E38A8 /* PopupView */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */;
+			productName = PopupView;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = BECC4B2D296C3AB60037807F /* Project object */;
 }
diff --git a/Better-me-iOS/.DS_Store b/Better-me-iOS/.DS_Store
index 3e6ed110d3cb91d12127a9d99fb88588195bbc83..a9222d84095193bf30cee3197afd4b78b92b8a73 100644
GIT binary patch
literal 6148
zcmeHKO^ee&7=EYiZqr@GuqZ5giFhq*y1I+v!8Ufi31Y+rKd4Pp+Gv^yO=^`|$XWdX
zeq9#-gjYeugJ*w${sBP{Jn1_htI2lD${wW1yfE`jX5M$^nP)mP9RMKKz^wr20H9%F
zSXjVp7h~-#O;}FWEFlu!M+_0Hz<p>zbHZCyC<T-Pv!(#syN95L`!<3$r1$Ud8oyJq
zTeKH)>iHKx_KxV$dfoA<gPz*?kLJ;*@88z`Cd%DMRM<_iD;hWqEP#dQ51Y>l_z*%L
zDBQ`+BKLV~nqQjx%O?jmuD|2lckQ!B|1jRmH^VdcmGPW|i^wcssyo9dl#0D}Lf?yG
z)BHqo`NG_MQ7dYT+AX_Fhj!eI2a(n6-(X)?DfON0a?`oywTBJ;@C6#gO)qHod4T7(
z(dFi*7r1n2(LvxwJk}NsT1hK4^ySg0a%Qb;tX9^>Wn*-9)hrvQPpyx~CGE(Gljp89
z?)treK4O&dpvRM*+d+xj@E8lJ8Qrt{flq@D*0P9sxC9U2GOkMp+L^V0+P9tU={0!v
zv%B@>4PS#yA8GBU`D8T59|9l8M$KE`Arn8#<N4;!_B4-&$G;zY^+EDT^^xW=%_qZy
zn2g6Pm|RJ1aTdrZ4oU%~z)UH?&Ibb%!>YtYAU`@V<4*v@0#<Xwvd#*KhQzAGL?E`H
z5fO?gLWz805D|{`hV-jSOazK>AoB4+<j6$6PzWC#`!~2dkg7nHD+QDSSq1XqQ)l=8
z#`O1pHb{Lb1(X8+l>($tx9b*8N#3m!lVf+Sf$26TX3Q@U$U`ub*D)`!t9Tg`H*7Ol
X0kJAE5r{Qt>W=`IL1jvTf2zPQNNL@W

delta 94
zcmZoMXfc=|#>B`mu~2NHo}w@l0|Nsi1A_nqLvd1haY0f}e$vFkm6HubSSGi#zS%6o
qA<VL|;V0u}b`E|Hpsvk=9N(EI^NUylHGnmO^n(mw*&HFVh8X}=sTC&x

diff --git a/Better-me-iOS/Assets.xcassets/.DS_Store b/Better-me-iOS/Assets.xcassets/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ac3b5b9625b64bea5b533dd32cb87b87a1ff84c8
GIT binary patch
literal 12292
zcmeHNyH6BB9R4jF5hEBLV$^C23oRs)_=+|Qo+weYpg@g<z~LQ{;}DKuw7F=Z39&M<
zuu!N>G{#qBWr9(ATMJ{Nm4AShh2P9Bv%kGtZfEwQh0JVbW^Zo4nfbnXKZwW~SjhDe
z?IEI8SmAfH!MQ`^Zh_B?_+Qu>(~J-Y_B<@!JBX&JOart4w_NjeZ9o%(1U>`XO(!T9
z!Ix-;dJ$5jG0M{<&BK<b^L--|rQ)m~S>_RKqkfveGl{Rubeu{w4Lb+qgnF0AVkw&)
zpDv99*}CKwR{R*OYZb5xSOu&CR)GztfEasWTC2u;Kh(Nb0jt1<RzUO*F0Amqz_0ke
z>^k6xDZKb!OyQ-$JJta*%nf`m@GHJAp}<Hed>`rrOAN<{Bit3A!}kKe;`=_F93M_j
zkg^l3P#l>$aIXBE9MAWyYZb5x)GBZoL7HoCzJmUBsj%{W^+Uf2I;Ym(=IGf1U-x^0
zM-L5Roj)a4{yDYlps{PPRpi<L&3V7cE8a#igxu4`5W~NdPJ(|4yDhWmD-YmF*ez*V
z0dEZy=UaIF_~+<HS<YI>kf#|k%Fjhct8#jX4kqzyxvq!e{Eog@hhJ=Z#Zt)63>m|3
z2c1Ic6;XfJcFg>`dj)lR8c#xLwtWFx<2X3?yVq1*P7zP2L?iJ;b@4z6y-~a_b$0^W
zPw6AM28A0+1I=`K9WY17@a<%KoG$g@sbBKW@4euvf#N*hzg0Z7kYVYXAtU^nTx1mU
zxv=D1I+VbU&VAFtaBiPJDQ<~r@zOKFMR=jZh1o?z*pog^1+?G^x{6jjCjETSE6-p*
zyM9U1rlqv;aQ+u>EB>kS#5HL&uBc9)(5a_Nry;eYpP)`V&L>RJT$B6vlqLr0b0yNn
z5W~NVhUE#y4BCO{+b8AeMA#-`&NZ6Pg1Husb3XlCjb)nHu$7x)qdZ+?7d_HE#<P7m
zg_#52d9;g!@@@L6hvFO;o+*wR>GAS3L&osiMx)?2hmqN6wz*v_RJF03>*NDfhYj#y
znWn)<d3(q@#^Vd9vtmY4qD2}(`Hm&m;LVOcl5@WPSaH@&mzS|QI)<;{Y>ic5V<_N)
zruG?n^z@x>nqYY=7w7N6?tymNyq%}PM_anwCG5i8fmu95@~(imZ7?Q(PX)hYMrL{i
z&RRIm_ttL3R}&ld;-=Ubo;$&FQTE!^BbVk{v->4jr-+4Xu+XbCNEK74NMkWY_3=PV
z*8g~Y>dw--=S{F&i{&Fq3sL{I(&qI)4L*i<C)O;uQ-ep$Nr&Mk%-GtGfw2aPb6tJH
zW^9S+ah7JtC_fh&#oD1dy)&4@<Y5zdj{h)2bH0Ovs%#C?=e*O!5anO-`RC-!O_Xu<
zE>r!Q{ZR7PMsxmsPZ@uM7{d0QE`}(7Pw?Nd&Yd#NUN5tpCJwH}yAh>@ab9?hXe6E*
zUDoP8QHu}>cmKrs|B3bQ|H+T6V->Ip{GSRqne0e*0Nli)J<f<N3>Wq??3%&1@^d)y
zC?38%iia<c;^FUS-+JO5VHMxU8_Yky1YpPiGG;%C_o}<?_>bC|S%#Bh+|H_V?ncJ#
Izdio{0kFAYj{pDw

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
new file mode 100644
index 0000000..2548403
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "image 6.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png
new file mode 100644
index 0000000000000000000000000000000000000000..af8e9c44dcee284565ced93f1b9ff60c40bff69f
GIT binary patch
literal 3082
zcmV+l4E6JgP)<h;3K|Lk000e1NJLTq004gg000~a1^@s6NZnxP00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH3!h0uK~#7F?OF+t
zRK*$o`puh}z1Vw~6+{6+(bdw#7_CS&Dhi~`QSnGDV~m!uJgBIZ(j=N_s)8oQcwk|b
zl_*vWDMex`QVEcQqeud3KtVwTxvv6tXP0HzYu?fM`pwnv&AdIrVyrkn^>*It{`>F0
z|L*^6fD)9T1SKfJCkRCLMUF?Alf+CZaJJqa0LKvMa2;$-)?!Wlc68x5fIJc9b{{Sf
z615SDWugN|isCh3Y|6leZVGG5yRaQ4`0v1Kzz_MjeB=-wh4+qCkIQi!z;49#nR%T4
z1}s#EA&8T#LbKI~HpNS-0lRx^aWYCUEHKm`sWe?;2EsKy2nz2k{{0g->dP2ma3rqE
zyc)DLU+V2aV-Tmj95czYY8PZ?T*N#+2l4+Iyv;`|qTI*|y@Lm0H`_L=hpym53V0Wr
zlY#LuDKY!NXjEbZflO6vjKqaQ{sQ2-s0lQULJ5WihW0K39Y2n?V~ToW?Km}(z$DYg
zr`Yu{yt9!TbXtvr&tL?Bhb`j!j2E#;(#N}RKnaEh=1>tSeVgIkHU@^XEe3}C{<Lc6
zDTvWDw}g$8Ef{avm|;k?x@qk^%+39GUm2Fv>_vwUm($qI_#7NG=~EjvE@FH!(VT#l
zVjV2mgh_M_ty1QZ_<g3`gqe{jHi`YTT0uUVP(_@JIpzZLKGqem8BlI@O)QBY#Jk0K
z@2W<9MHJuXYs!pc4lYEewH)8%sXLETckx*iOW+L*0=>=TUE)@_IAXeZMs#v)6Iv{Z
zE7{#jek@mFO{^SC#a{G!{5E4W`JG9A&*Z1UAbVYG3|<qPa5QWlCBME#Tx?1&Se`)j
zh;aM?b}cs(lpPIb;h<K;7&xufgF3qb-wK%^%8hti5B|82sRejsKGlc??C%c=8rvDD
z-61vW!#STBD9B|0@B5lCgYUhecnks=Bu>$JAs@G~?_d~R_P^9qj}wDyAgxz&@~Fey
zR6SlUGX7^OQ^Ej1I!iRU&gHsi@jV%&MLyPYeUt5a+{Ev$BK=!>M&p8_b8ruc^ZEb*
z`X;Lx7fQ{-8yF&}L9!mzZUb(EiW2f28>r7d%{j`Aw;cSLr|(*R#zIIokc&AC81K%|
zXI6*F2nRunF)=E=xyuG%v_Tpe@4bEjrc;jxX?339XLA@`^7)OZz>9KBKCqOH7)7l)
zEB9^SX7YPgk@2&7lV}K`jRa*zp2p|d!%d{~C||1z7?C*FaIu){oC7`X$@fo=*?37#
z^7m00rwbR0_<DW_8*0PPphaEGgOxixp=O^9+{F`nb#|mJQAWm3=KHCd2TqW}y+X_P
z)h1dlo+Qe-THE`EfnQ1o`)PMBrJJ}XGq=gk*+-kOT(n_*O5#DbwG($51>dBxzLMYD
zxj}R3-1j;*#&Fzpp&dfb@gDKk^YtI`8mvGY(DyD)puj`OAM#$}JnOjlD``!1K;Dtt
zm`hk&xR1a0d0&n)nuzD48>XA-bz6LT_|#-%vvFS?+9`>mP%j}Y12K`OQ<0JH1|G@{
z{QWHFn37*ACS`sT{IiV1)LN%%>m2WNd70TO-ghl(Z3FWupE^xmi#gwO5rH`O?R#v=
z#$?r;?+K|6OSX1W%<K>0>Fz6%=B1i&4*PmEyhO6a=fgqsc^BJLIdj&4=XLW>^R_}a
zS$)korC^?V+^zHDG<pZh2h@mv`OJF*ZrA&%-KWv=9MW(Os=|@iSBDz*Z4a#Z135Zv
zL5Me{zX@Mg)(`_g2kCG<+X8eJW!J0bv-~_r#S`a0DNBQ{Vrjs&J(TTJ>kiOfsP;3r
zM!s|1t9|aXHob2{Hv2`Of`P?6ZuWQeMw*}LfL4?-@as_rlpf|GT7h5jWbf0OF2%%=
zP1R%#H9_RfAm`g2t;EYZj%debTB7+{Q?p|*;0&V)JR%O_kT*7g58`cD5LSK6LS2zI
z&N(j|e38yRzP<0`3wV}6;cji-RX#p6Ehmv_zP>1a!Jsgeqs4bxn8$tOBe+7ngqnR;
zPM#;>*Yi|8)72sjFJitZ-9*3b;whe{s%Qd_WZGJVf2HT}<jvKatX}Wb#q!*sx;yC|
zm=P-%TP98wS_VkI%B^nvG!^j9T+`|Bu}d>s9J-?>-oh}U69vw_JLY1mj|T%uJ#(>z
zKZc^Ll7TQipV>;EpO<t>H*<|Q>c|{hEqq96>lU8sNvvWT^I}1>s=N1kCidYh?>s1X
zGYENHY(>9-zgR?2zIl2fc?|^iR#xJ$-##20I0EISZxW0lA9oHijP4U#iuMS`3vxs_
zwECn!U6TQE7*0VktuRH)gKk_@wevO%1`;2tpCRY@IqJ+q>G$T?c5d^P8EUjTy$hi?
zsY#afmt^)*phZoitI~6cO%&{7Vki1Ag1|t}@rxAQM!HH_j1Q%FZ45N$N80eWq6C#r
z+36ho7=a<+fSZ{PgNIJdA-$~oW>VsJAv$o<ZvOne*GjvAVQ;>Ic1FUr>C>9qW}2>a
z`W0d1t1XQOVYU(R`PCeBrC`=YIc^+_J?$7#VEMOQ4`|5jJ4PL&<Rpa^0EO2rQB^6?
z?G>{^NRrdAzW*6ezWcO{MfM3ytB4d=HpAo!;;^eT+1aoIJ{6@heVGM+Iat_{On{>D
ze!T;@j6qU&@KJqL2A*Qtwb9;z2Ykf`>DP?7EK=SLXpbAH@Ww`A2ege;X<>gCnv3z`
zIJm6L!FpENR?4yAIXk5_bdCJzV72xx;x49!$h(>DdYRRQ^~@G7R>+~7&+_NzSuVXX
z`!K4%nN_6wnT9N*pl1ir-z-0Xo$4j!;xCkR-Zx5I&GA?3$m;slwphvpzO7saxtON&
zLJ8|WQIKY<s-mfsPnBss#*G5MIhk=sT$N3kevMOZL}qf~3{<nU`j|W^?<3_ktVuNB
z2jt;Z;<j+}&$0Rn)5?!ENG#XBglpi@-Wujk+3ugfV9Gm#CH58Em$Nfg;yl%tHv5}Y
zUCeLN=(}&BP;SY6hfOZfMIv`(KPx)0r@tPvSjhQZhQ5$47E;J>kj54Y`2@CIg1n|m
zMk#Xy^5$6GAnGc{Q}IVT=?#!%a$Q>^F0}-9n|^+8wL9@0Z#e7rEXRI@*Sz<z(m0iU
zC#B_tui8gh24x*Vt;bpJ6;Dpk*0MA@nuVf}g3Yje@c>XJ0`V>_ov*<jBqq=T#ApZR
zG1vbZ_v(uoS`*AD-lM!%5$TZqG%w=>P8XRiRJXM(aCvUn(>8UnAk+~U9!OPnqshFE
z{@RxU#X7K%gjGhM`=0YT@eN4lrP+;F0o2bKWW5@oy&NbiXcf)2G)7QfW@0rF_5}Mg
zzov*#`<auo!gVeA+^AtRlJYfDJ^787{P$1ZTHcw<kt>nnq3zPfC1~4H7$($>K`-4{
zyT;&AZmlnxcj3Q?q96CAywYD2Q8W%{?=q6Y4gCFsHXzQwm$U79BAkJ&Tm%l$V&2Yb
zsy9A=sUlc!7I@7ok+Sp{^1P)|Kr-`!s&yZZ;Ow$aED;5n8yQMqE*EhLpXb=*yS?KM
zCY6>^bFbuW(*wcVrp*Z~=Fh{zZ~hhCZA83ZZ7Of>REbq>U@-SqLE8&P6@H^WDtPP0
z^6C||ME4?nz;#}g#;Kh8M`k^yiNpD9KxH-L^C_gG^B!u{lLCWkWC5td#Dlf~>9M@X
z!(7gDSjV9?`z`W{vN}2*Z|nULRjvlsWMr_*jNp0S97oW>E5@71?{!kuW(4~6ex)RQ
zo;DqvXSR8=MTXY#2k)w}4&!L<M)gO~&&t>i-OLX#E<!y$CFOv15gaM+EWD~!(8CgG
zxr@4f)1$qMv_myim19!^V`FJ;-#=J|jwRqRH20P`aBMlgy6mcqBO>--f3be`A7W}*
zM2jE7&SJ8mEKHV@C&VkUXRx%GxN#PtPfXb;vm!`Tw&9?_$1+$gK?zDwf)bRV1RnwX
Y2iTP}ka2yW1poj507*qoM6N<$f_sJPQ2+n{

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json
new file mode 100644
index 0000000..1d0dfcc
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 44.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png
new file mode 100644
index 0000000000000000000000000000000000000000..4be4b5b9efe13c0dd3f171abd2b81877ce1950bf
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZM!3HFoqjMdB6lZ})WHAE+w=f7ZGR&GI0Tg5`
z4sv&5Sa(k5C6L3C?&u3txv`)7Pa-Q&j>Xf(F{Fa=?Ul2<O$H+DADFl;xRhV8?P63p
zFqgB1bH`+XM=ZM<^Ar|WJU{*2JlAPM=Il$&?Dv<-uYaqb`RmjS$1S<iyCRxD@bX#t
zU;g5<I%4zl>@6$u8$@3$4qe!hC{cDsOk~FMO4(x>z5&_+37>7^IZhdx_a*mz4Ew^p
z=Czeb#3YrAM(rP&OsiC)3{G$A<Fj46QPt~#V&CJwoeV!0nqOUJ;wyi~XiMrttA7vP
zH~ctf@>98(^;6VdbKlFSKFwJECp2tzm_pW6KAn})YXj}v)=t|LwRK<6s-sQ|z66HM
z;BHzVB=Koe?QFST2hKk+vQeUGEZ=JXC$VY#vN~h&!6Rmk;~vI{x}!B|2I`r>@L}+D
L^>bP0l+XkKD58(N

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json
new file mode 100644
index 0000000..95cd3ab
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 65.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png
new file mode 100644
index 0000000000000000000000000000000000000000..37749643d4a00930ff0289e1545c0b24d382b8e7
GIT binary patch
literal 1094
zcmV-M1iAZ(P)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1KUYNK~#7F-I~2}
z+eQ$_cMk`SGIoK&bkbx3KY{5sDXcs}<SrdGlRlP;w2729MXdChp}KU|8(1!q*31)_
z8aIh$&tUwiAr80RJ&7<)K_Z9`3gE91aX5kZ=kD#^?E#@8C=3E~@}>s~d<RG&0rjLE
z3B##w5%(Mc;)w733knYP+Vvrhq6jJgp#&lzK6$-?3H13=1|L8%4hdktbDRvI1ck&n
zE4+Jk9|*UgxPYv|j0kC<Rc9anI~l=(EG%Z+Rre8a2PzaXi-<Cc_SXKl4;K8te7yf+
zE!2s52xoI)8Hgy)^S{k&C6%X>>3V&g#7~wfMBsT88vfps&(&6*{&U5|H`Oov&;iuw
zR&xkEi@(b_=5@T(&D;aX&5ve)wBtXwyBFTR=tkp&Ot?f)rkJycwNNBkCOqg(eVpuP
zw13KJ)RM`5WpgACk@oyMvr+C`0PvFd5j0zf5SV2AaJKOiF{kbYA+!SQ&4%pM&BVRL
zD(w;Di1fAO7B5@fLN&FFw&Q-wgb2Jw)Twn+%Z$6;)4If{@B8kr{c9g;AhnK`D;Ba@
zrx5kWpXqfCf`a6&zrmSt;M|Ob^r0@k{3`o%g%DUbeno)`!|Tv)dK5yS%$i>6O1LHh
z^G5d+*w$O+6od^HL$_fCuv|n@Qb~aoz$3WL(F{Xa5isturV_Y>cuB~`ukQkWbJu;Q
zzaInr^Z4S2Jv%Cuhf0Z=O^8)sfBd1apj-uwwxGF;I^tbr2n9%g!DhJG>DsIe^S)gD
z^z%nCEX4lyE7StluN4=zhp+-zpd-#Rcmyi|3mGb2avs1cVBt_{W5mrWIUl)7^mQ{-
z7&##=pEr0YJ585o<e&#y45t@2ekaC{6PY*lxZ1O$?9UZ}2&2h~o69reYVl3n1ERT=
z_C=Y_Lv<81$YT1?v^pc(XXATMq50L!6tRk@5<ZNAkzA*1GqDa4?Lv#NR_#rM2<Hmt
zaaTQ&(kC<=v5J14+?sAXw`w+?y$8+DJCV58Y~wjGpRw6ERBuCrAyT{3?lmEEKjT6j
zVKe6skE`<{&O8Xa{7mzP-r<5r<>9(8EX03db}qU-_dS5d2$~~A$n{dg_=eg-L=kiq
zIVd8lwmUE5!Mu(OyrBW1XT3*A%RIxuq4vzZtjV55?t+Fyxemv5PORI6`5s;ZPT*?W
zKQ?#r3K4Q!W*V`QHhPm3^((ei#B*bh_a+Y}M|+D<NX#^62UT)DvJS<F#GPar?_Wy}
ziins{TFeAFACY4PcHDJWj7JPz>r~K~xF=c|64xHsst2+|EF)l=4|^+xd&^O2a{vGU
M07*qoM6N<$f;)Kl=Kufz

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
new file mode 100644
index 0000000..15595a6
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Magnifier.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b20326b75e0f165c551042a89f352b7d6e54a47
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0kBC#K~#7FwUyg-
zf<O?42eklFLDE661MMIkcsu&4sX*)?zUomdAst9MAQglXD8Nhp9|wZ#M&Q9YXWeBl
z-_C7Ekq3!Wwjl@t7oDr0$zU)@q=Nhl-fT8~$8mb+^SN_%z;PnXEk~o#PU?W6;R_B1
z1z?O8DU@qoHs5G8y09QF1rvHYo%R^M01_UL$HjO&4$VE7_h}726O6l)$t1c9hWS5)
z0#2YWcVxX@`_Oo<nzv2gHww^xrfC_J!ael0Dl#+IbFiAm{#`0cv)S~~QPZgv%#_k#
z#V{$V3a0tY5)57X{st_Xr`Qxrefiejvw>5A*0IzSoJoUrI2^3OODCbRC-vo(Kdn~l
z7OcJsnf&loU3f<<vB_Nl=ofpW&Ri-Al;B>*Cp6b`Fp~U3F3<N(58RdQcH4szzFZ#2
z!d$<4d8^gRLvHR>iyaS`wLq)gRH126LhG6@&sv1CdZAOF@|RN2v`8;zTw=z>2Dg??
zYK8QfLE~QGf=m)zyhIkzb&Sp41}`o2bPo==Yyie)CDT`%!-vCRyArsH6ydP)sp`K>
dtqbJQ@(Wyn>H5O5B&h%Z002ovPDHLkV1l+t>V5zK

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
new file mode 100644
index 0000000..ff2ea14
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "so-trash.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png b/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cb7bb47522d6f1959f7f4caaa9aef4789ff16e9
GIT binary patch
literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000vJ000&U1^@s6BAusy00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0YOPbK~#7FtyJw%
zgfI|YzJ8ld)DEzN>p&R>>d+4S&G4ZWNC~k5wE|ND{^!HDBQhj+x#KwAOlBY1?8|18
zg=j-KHb+%e0!EngQ4}d#jB9fY!|>Sm{kJ)aqNwOpW?1x~IUMI6g5h3(<4DZEPT9C_
zgKX<bEYI^D7QNAWL~$Iy_{==dlQ_Z?tpu`@v^BKbEX(p4^|+#iKt>Annoi^!{%eeo
z76Kbfm`ThvoDE$7O$;~sGt#>2x?5NlS0h*a&77adxVf^5&G40`=_dyxP%&rA-^?NM
zZfw3UX6|$fW?9V4wyW6+F?CGrEO1|1#rP4jMPUUkK-;#OnAQPVmffIFKj`nc5@R>I
zYJ-Ou0{wiKB#Hcw*E%2wf(8qiidit(xbORF9)IWp&bb8pF&Vbs^&ufN`9)9ZD1HGi
WBaxU68bs;<0000<MNUMnLSTZb5wg|*

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Base.lproj/Main.storyboard b/Better-me-iOS/Base.lproj/Main.storyboard
index 320236f..b1ed38b 100644
--- a/Better-me-iOS/Base.lproj/Main.storyboard
+++ b/Better-me-iOS/Base.lproj/Main.storyboard
@@ -474,7 +474,7 @@
                                 </subviews>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0ia-fn-8Be">
-                                <rect key="frame" x="-11" y="59" width="394" height="44"/>
+                                <rect key="frame" x="-14" y="59" width="391" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                         </subviews>
@@ -840,28 +840,43 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
-                        <segue destination="GrP-Sx-epD" kind="relationship" relationship="rootViewController" id="c8H-Vj-xKL"/>
+                        <segue destination="GrP-Sx-epD" kind="relationship" relationship="rootViewController" destinationCreationSelector="addSwiftUIView:" id="c8H-Vj-xKL"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jTY-O2-O9R" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-918" y="354"/>
         </scene>
-        <!--View Controller-->
+        <!--Social View Controller-->
         <scene sceneID="HkT-Mj-ueX">
             <objects>
-                <viewController id="GrP-Sx-epD" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="FdV-kQ-Xf4">
+                <viewController id="GrP-Sx-epD" customClass="SocialViewController" customModule="Better_me_iOS" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="FdV-kQ-Xf4" customClass="SocialViewControllerSocialViewController">
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oBR-7s-wo2">
+                                <rect key="frame" x="0.0" y="103" width="393" height="666"/>
+                                <connections>
+                                    <segue destination="pYz-Fy-JDu" kind="embed" destinationCreationSelector="addSwiftUIView:" id="aD7-lc-wt8"/>
+                                </connections>
+                            </containerView>
+                        </subviews>
                         <viewLayoutGuide key="safeArea" id="o3c-Ra-Hbi"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="top" secondItem="o3c-Ra-Hbi" secondAttribute="top" id="2Wn-Aw-mdE"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="bottom" secondItem="o3c-Ra-Hbi" secondAttribute="bottom" id="7qY-8R-TBR"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="top" secondItem="o3c-Ra-Hbi" secondAttribute="top" id="IeS-ET-YHf"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="leading" secondItem="o3c-Ra-Hbi" secondAttribute="leading" id="LOj-IU-BTt"/>
+                            <constraint firstItem="o3c-Ra-Hbi" firstAttribute="trailing" secondItem="oBR-7s-wo2" secondAttribute="trailing" id="xYZ-Yp-nFh"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="m3Q-6u-C0D"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="7uG-hm-9zt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="354"/>
+            <point key="canvasLocation" x="52.671755725190835" y="353.52112676056339"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="K5I-fQ-Ex3">
@@ -1052,7 +1067,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AoP-gY-6si" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="1056"/>
+            <point key="canvasLocation" x="52.671755725190835" y="1054.9295774647887"/>
         </scene>
         <!--좋은 습관 만들기-->
         <scene sceneID="btS-4h-SSP">
@@ -1147,7 +1162,7 @@
                                 </constraints>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CoN-8S-PM6">
-                                <rect key="frame" x="-11" y="59" width="395" height="44"/>
+                                <rect key="frame" x="-16" y="59" width="394" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f3A-Aq-spj">
@@ -1304,7 +1319,7 @@
                                 </subviews>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ORX-v8-4xn">
-                                <rect key="frame" x="-10" y="59" width="394" height="44"/>
+                                <rect key="frame" x="-13" y="59" width="391" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mm5-G8-rgC">
@@ -1688,6 +1703,14 @@
             </objects>
             <point key="canvasLocation" x="1108" y="2572"/>
         </scene>
+        <!--Content View-->
+        <scene sceneID="h5b-MK-qEN">
+            <objects>
+                <hostingController id="pYz-Fy-JDu" customClass="ContentView" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="N8B-4N-TOR" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="839" y="535"/>
+        </scene>
     </scenes>
     <resources>
         <image name="AwardButton" width="21.666666030883789" height="28.333333969116211"/>
diff --git a/Better-me-iOS/HomeViewController.swift b/Better-me-iOS/HomeViewController.swift
index 16816e9..d6773c0 100644
--- a/Better-me-iOS/HomeViewController.swift
+++ b/Better-me-iOS/HomeViewController.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import SwiftUI
 
 class HomeViewController: UIViewController {
 
diff --git a/Better-me-iOS/Social/Data/FriendSearch.swift b/Better-me-iOS/Social/Data/FriendSearch.swift
new file mode 100644
index 0000000..fc4e122
--- /dev/null
+++ b/Better-me-iOS/Social/Data/FriendSearch.swift
@@ -0,0 +1,33 @@
+//
+//  RandomUser+ResponseData.swift
+//  Server
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+
+struct FriendSearch: Codable, Hashable{
+    
+    
+//    var id = UUID()
+    var followee: Int
+    var nickName: String
+//    var photo: String
+    var stars: Int
+    
+}
+
+
+
+
+struct FriendSearchResponse: Codable{
+    
+    var result: [FriendSearch]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+
+}
+
+
diff --git a/Better-me-iOS/Social/Data/FriendSearchModel.swift b/Better-me-iOS/Social/Data/FriendSearchModel.swift
new file mode 100644
index 0000000..72a3ff9
--- /dev/null
+++ b/Better-me-iOS/Social/Data/FriendSearchModel.swift
@@ -0,0 +1,42 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class FriendSearchModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var FriendsSearch = [FriendSearch]()
+    
+//    var params = 
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/1"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: FriendSearchResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.FriendsSearch = receivedValue
+            }).store(in: &subscripttion)
+        
+    }
+    
+    
+}
diff --git a/Better-me-iOS/Social/Data/InviteHabit.swift b/Better-me-iOS/Social/Data/InviteHabit.swift
new file mode 100644
index 0000000..83304fd
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabit.swift
@@ -0,0 +1,24 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+struct InviteHabit: Codable, Hashable{
+    var senderIdx: Int
+    var receiverIdx: Int
+    var habitIdx: Int
+    var habitName: String
+    var contents: String
+    var emoge: String
+}
+
+struct InviteHabitResponse: Codable{
+    var result: [InviteHabit]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
diff --git a/Better-me-iOS/Social/Data/InviteHabitModel.swift b/Better-me-iOS/Social/Data/InviteHabitModel.swift
new file mode 100644
index 0000000..5807312
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabitModel.swift
@@ -0,0 +1,38 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class InviteHabitModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var InviteHabits = [InviteHabit]()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/2"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: InviteHabitResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.InviteHabits = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/NewPerson.swift b/Better-me-iOS/Social/Data/NewPerson.swift
new file mode 100644
index 0000000..00e3cdf
--- /dev/null
+++ b/Better-me-iOS/Social/Data/NewPerson.swift
@@ -0,0 +1,36 @@
+//
+//  RandomUser+ResponseData.swift
+//  Server
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+
+struct Priend: Codable, Hashable{
+    
+    
+//    var id = UUID()
+    var followee: Int
+    var nickName: String
+//    var photo: String
+    var promise: String
+    var acceptedAt: String
+    var stars: Int
+    
+}
+
+
+
+
+
+struct FriendResponse: Codable{
+    
+    var result: [Priend]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+
+}
+
+
diff --git a/Better-me-iOS/Social/Data/NewPersonModel.swift b/Better-me-iOS/Social/Data/NewPersonModel.swift
new file mode 100644
index 0000000..555454f
--- /dev/null
+++ b/Better-me-iOS/Social/Data/NewPersonModel.swift
@@ -0,0 +1,44 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class NewPersonModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var Friends = [Priend]()
+    @Published var nickNameArray = [String]()
+    var baseUrl = "http://54.180.13.219:3000/app/follow/1"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        self.Friends = Friends
+        fetchRandomUsers()
+        appendNickName()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: FriendResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.Friends = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+    func appendNickName(){
+        nickNameArray = Friends.map{ $0.nickName }
+
+    }
+}
diff --git a/Better-me-iOS/Social/Data/Person.swift b/Better-me-iOS/Social/Data/Person.swift
new file mode 100644
index 0000000..4b49dcb
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Person.swift
@@ -0,0 +1,18 @@
+//
+//  Person.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/12.
+//
+
+import Foundation
+
+struct Person: Identifiable{
+    
+    var id = UUID()
+    var name = ""
+    var online = false
+    var like = 0
+    var habit = "습관 없음"
+    
+}
diff --git a/Better-me-iOS/Social/Data/PersonModel.swift b/Better-me-iOS/Social/Data/PersonModel.swift
new file mode 100644
index 0000000..ead1501
--- /dev/null
+++ b/Better-me-iOS/Social/Data/PersonModel.swift
@@ -0,0 +1,35 @@
+//
+//  People.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/16.
+//
+
+import Foundation
+
+
+
+
+
+class PersonModel: ObservableObject {
+    @Published var people = [Person]()
+    
+    init(){
+        people.append(Person(name: "신디", online: false, like: 17, habit: "일어나자마자 이불개기"))
+        people.append(Person(name: "리미", online: true, like: 23))
+        people.append(Person(name: "매버릭", online: true, like: 7, habit: "일어나자마자 양치하기"))
+        people.append(Person(name: "범", online: false, like: 2))
+        people.append(Person(name: "폴", online: false, like: 9, habit: "일어나자마자 아침먹기"))
+        people.append(Person(name: "벨라", online: true, like: 0))
+        people.append(Person(name: "피딕", online: false, like: 8, habit: "일어나자마자 과제하기"))
+        people.append(Person(name: "주니", online: false, like: 10, habit: "일어나자마자 청소하기"))
+        people.append(Person(name: "포디", online: true, like: 11))
+        people.append(Person(name: "혀니", online: false, like: 13))
+    }
+    
+    
+
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/Request_Friend.swift b/Better-me-iOS/Social/Data/Request_Friend.swift
new file mode 100644
index 0000000..16000e9
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_Friend.swift
@@ -0,0 +1,24 @@
+//
+//  Request_Friend.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/04.
+//
+
+import Foundation
+
+struct RequestFriend: Codable, Hashable{
+    var userIdx: Int
+    var nickName: String
+//    var photo: String
+}
+
+struct RequestFriendResponse: Codable{
+    var result: [RequestFriend]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/Request_FriendModel.swift b/Better-me-iOS/Social/Data/Request_FriendModel.swift
new file mode 100644
index 0000000..84e6554
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_FriendModel.swift
@@ -0,0 +1,38 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class Request_FriendModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var RequestFriends = [RequestFriend]()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/request/2"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: RequestFriendResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.RequestFriends = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/SocialViewController.swift b/Better-me-iOS/Social/SocialViewController.swift
new file mode 100644
index 0000000..b7d14e0
--- /dev/null
+++ b/Better-me-iOS/Social/SocialViewController.swift
@@ -0,0 +1,40 @@
+//
+//  SocialViewController.swift
+//  Better-me-iOS
+//
+//  Created by 황인성 on 2023/02/01.
+//
+
+import UIKit
+import SwiftUI
+
+class SocialViewController: UIViewController {
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        navigationController?.setNavigationBarHidden(true, animated: animated)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+    
+    @IBSegueAction func addSwiftUIView(_ coder: NSCoder) -> UIViewController? {
+        return UIHostingController(coder: coder, rootView: ContentView())
+    }
+    
+
+    /*
+    // MARK: - Navigation
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
diff --git a/Better-me-iOS/Social/SwiftUIView.swift b/Better-me-iOS/Social/SwiftUIView.swift
new file mode 100644
index 0000000..c0a73e0
--- /dev/null
+++ b/Better-me-iOS/Social/SwiftUIView.swift
@@ -0,0 +1,931 @@
+
+//
+//  ContentView.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/11.
+//
+
+import SwiftUI
+import PopupView
+
+
+
+struct FriendSearchView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    @State var array = ["신디", "리미", "매버릭", "범", "벨라", "폴", "피딕", "주니", "포디", "혀니", "asd", "asd","asd","Asd"]
+    
+    @State private var searchText = ""
+    
+    var body: some View {
+        
+            VStack {
+                SearchBar(text: $searchText)
+                    .padding(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 0))
+                
+                List {
+                    ForEach(array.filter{$0.hasPrefix(searchText) || searchText == ""}, id:\.self) {searchText in
+                        
+                        ZStack(alignment: .leading) {
+                            Rectangle().fill(Color(red: 0.5, green: 0.5, blue: 0.5, opacity: 0.30)).cornerRadius(8).frame(height: 55)
+                            
+                            HStack {
+                                Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                                    .foregroundColor(Color.random()).padding(.leading)
+                                Text(searchText)
+                            }.listRowSeparator(.hidden)
+                        }
+                    }.listRowSeparator(.hidden)
+                } //리스트의 스타일 수정
+                .listStyle(PlainListStyle())
+                //화면 터치시 키보드 숨김
+                .onTapGesture {
+                    hideKeyboard()
+                
+            }
+//            .navigationBarItems(leading:
+//                                    Button(action: {
+//                self.presentationMode.wrappedValue.dismiss()
+//            }, label: {
+//                Image(systemName: "x.circle")
+//            })
+//            )
+        }
+    }
+}
+
+
+struct homeView: View {
+    var body: some View {
+        
+            NavigationView{
+                Button(action: {
+                        print("Floating Button Click")
+                }, label: {
+                    NavigationLink(destination: SearchView()) {
+                        Image("Group 65").frame(width: 51, height: 51, alignment: .bottomTrailing)
+                     }
+                })
+            }
+        
+    }
+}
+
+extension View {
+    func underlineTextField() -> some View {
+        self
+            .padding(.vertical, 10)
+            .overlay(Rectangle().frame(height: 2).padding(.top, 35))
+            .foregroundColor(.black)
+            .padding(10)
+    }
+}
+
+extension Color {
+    static func random() -> Color {
+        return Color(red: Double.random(in: 0...1), green: Double.random(in: 0...1), blue: Double.random(in: 0...1))
+    }
+}
+
+struct CheckboxFieldView: View {
+    
+    @State var checkState: Bool = false
+    
+    var body: some View {
+        
+        Button(action:
+                {
+            self.checkState = !self.checkState
+            print("State : \(self.checkState)")
+        }) {
+            HStack(alignment: .top, spacing: 10) {
+                
+                //2. Will update according to state
+                Rectangle()
+                    .fill(self.checkState ? Color.green : Color.red)
+                    .frame(width:20, height:20, alignment: .center)
+                    .cornerRadius(5)
+                
+            }
+        }
+        .foregroundColor(Color.white)
+        
+    }
+    
+}
+
+
+struct SecondView: View{
+    
+    @State var show = false
+    var list = ["김서아", "김귤"]
+    @ObservedObject var data = Request_FriendModel()
+    
+    var body: some View{
+        
+        ZStack {
+            List{
+                ForEach(data.RequestFriends, id: \.self){ request in
+                    HStack{
+                        Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                            .foregroundColor(Color.random())
+                        Text(request.nickName)
+                        Spacer()
+                        Button(action: {
+                            print("거절")
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .stroke(Color.red, lineWidth: 1)
+                                    .frame(width: 58, height: 31)
+                                Text("거절")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.red)
+                                    .lineSpacing(18.20)
+                            }
+                            
+                        })
+                        Button(action: {
+                            print("수락")
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .frame(width: 58, height: 31)
+                                    .foregroundColor(.red)
+                                Text("수락")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.white)
+                                    .lineSpacing(18.20)
+                            }
+                        })
+                    }
+                }.buttonStyle(BorderlessButtonStyle())
+            }.frame( maxWidth: .infinity, maxHeight: .infinity)
+                .edgesIgnoringSafeArea(.all)
+            .listStyle(PlainListStyle())
+        }.popup(isPresented: $show, view: {
+//            self.AgreePopUp()
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+    }
+    
+    func AgreePopUp(name: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("공유해요!")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 52, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name) 님의")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+//                Spacer().frame(height: 21)
+//
+//                Text("[ 일어나자마자 이불개기 ]")
+//                    .fontWeight(.bold)
+//                    .font(.subheadline)
+//                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("친구요청을 수락하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show = true
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+}
+
+struct ThirdView: View{
+    
+    @State var show = false
+    @State var name = "default"
+    @State var habit = "default"
+    @ObservedObject var data = InviteHabitModel()
+    
+    var body: some View{
+        ZStack {
+            List(data.InviteHabits, id: \.self){ invite in
+//                ForEach(model.people){ p in
+                    HStack{
+                        VStack(alignment: .leading){
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 19.50)
+                                    .fill(Color(red: 1, green: 0.92, blue: 0.92))
+                                    .frame(width: 74, height: 27)
+                                HStack {
+                                    Image(systemName: "person.circle.fill").resizable().frame(width: 19, height: 19)
+                                        .foregroundColor(Color.random())
+                                    Text(String(invite.senderIdx)).fontWeight(.semibold)
+                                        .font(.caption)
+                                        .lineSpacing(16.80)
+                                }
+                            }
+                            HStack(alignment: .top) {
+                                Text("😊")
+                                    .fontWeight(.semibold)
+                                    .font(.subheadline)
+                                    .lineSpacing(21)
+                                VStack {
+                                    Text(invite.habitName)
+                                    Text(invite.contents)
+                                }
+                            }
+                        }
+                        Spacer()
+                        VStack{
+                            Button(action: {
+                                print("수락")
+                                self.name = String(invite.senderIdx)
+                                self.habit = invite.habitName
+                                self.show = true
+                            }, label: {
+                                ZStack {
+                                    RoundedRectangle(cornerRadius: 15.5)
+                                        .frame(width: 58, height: 31)
+                                        .foregroundColor(.red)
+                                    Text("수락")
+                                        .font(.footnote)
+                                        .fontWeight(.semibold)
+                                        .foregroundColor(Color.white)
+                                        .lineSpacing(18.20)
+                                }
+                            })
+                            Button(action: {
+                                print("거절")
+                            }, label: {
+                                ZStack {
+                                    RoundedRectangle(cornerRadius: 15.5)
+                                        .stroke(Color.red, lineWidth: 1)
+                                        .frame(width: 58, height: 31)
+                                    Text("거절")
+                                        .font(.footnote)
+                                        .fontWeight(.semibold)
+                                        .foregroundColor(Color.red)
+                                        .lineSpacing(18.20)
+                                }
+                            })
+                        }.buttonStyle(BorderlessButtonStyle())
+//                    }
+                }
+            }.listStyle(PlainListStyle())
+        }
+        .popup(isPresented: $show, view: {
+            self.AgreePopUp(name1: name, habit1: habit)
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+    }
+    
+    func AgreePopUp(name1: String, habit1: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("화이팅")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 52, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name1) 님께서 보내신")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("[ \(habit1) ]")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("습관초대를 수락하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show = true
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+}
+
+struct CustomTopTabBar: View {
+    @Binding var tabIndex: Int
+    @Namespace var animation
+    var body: some View {
+        HStack {
+            
+            TabBarButton(text: "친구", isSelected: .constant(tabIndex == 0))
+                .onTapGesture { onButtonTapped(index: 0) }
+            
+            Spacer()
+            TabBarButton(text: "친구 요청", isSelected: .constant(tabIndex == 1))
+                .onTapGesture { onButtonTapped(index: 1) }
+            
+            Spacer()
+            TabBarButton(text: "습관 초대", isSelected: .constant(tabIndex == 2))
+                .onTapGesture { onButtonTapped(index: 2) }
+            
+        }
+        .border(width: 1, edges: [.bottom], color: .clear)
+    }
+    
+    private func onButtonTapped(index: Int) {
+        withAnimation { tabIndex = index }
+    }
+}
+
+struct TabBarButton: View {
+    let text: String
+    @Binding var isSelected: Bool
+    var body: some View {
+        Text(text)
+            .foregroundColor(isSelected ? .red : .gray)
+            .frame(width: 122)
+            .fontWeight(isSelected ? .heavy : .regular)
+            .font(.custom("Avenir", size: 16))
+            .padding(.bottom,10)
+            .border(width: isSelected ? 2 : 0, edges: [.bottom], color: .red)
+    }
+}
+
+struct EdgeBorder: Shape {
+    
+    var width: CGFloat
+    var edges: [Edge]
+    
+    func path(in rect: CGRect) -> Path {
+        var path = Path()
+        for edge in edges {
+            var x: CGFloat {
+                switch edge {
+                case .top, .bottom, .leading: return rect.minX
+                case .trailing: return rect.maxX - width
+                }
+            }
+            
+            var y: CGFloat {
+                switch edge {
+                case .top, .leading, .trailing: return rect.minY
+                case .bottom: return rect.maxY - width
+                }
+            }
+            
+            var w: CGFloat {
+                switch edge {
+                case .top, .bottom: return rect.width
+                case .leading, .trailing: return self.width
+                }
+            }
+            
+            var h: CGFloat {
+                switch edge {
+                case .top, .bottom: return self.width
+                case .leading, .trailing: return rect.height
+                }
+            }
+            path.addPath(Path(CGRect(x: x, y: y, width: w, height: h)))
+        }
+        return path
+    }
+}
+
+extension View {
+    func border(width: CGFloat, edges: [Edge], color: SwiftUI.Color) -> some View {
+        overlay(EdgeBorder(width: width, edges: edges).foregroundColor(color))
+    }
+}
+
+struct SortButtonView: View{
+    var body: some View{
+        VStack{
+            Button(action: {
+                
+            }, label: {
+                Text("상장 많은 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("상장 적은 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("가나다 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("최근 추가순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("오래된 순")
+            })
+        }
+    }
+}
+
+
+struct SortView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    var body: some View {
+        NavigationView{
+            VStack(alignment: .leading){
+                Rectangle().frame(height: 0)
+                SortButtonView()
+                Spacer()
+                Button(action: {
+                    self.presentationMode.wrappedValue.dismiss()
+                }, label: {
+                    Text("닫기").frame(width: 375, height: 80).foregroundColor(.black
+                    )
+                })
+            }.padding(.leading)
+                .navigationBarTitle("정렬", displayMode: .inline)
+        }
+    }
+}
+
+struct SearchBar: View {
+    
+    @Binding var text: String
+    
+    var body: some View {
+        HStack {
+            HStack {
+                TextField("친구 찾기", text: $text)
+                    .underlineTextField()
+                    .foregroundColor(.primary)
+                
+                Image(systemName: "magnifyingglass")
+                if !text.isEmpty {
+                    Button(action: {
+                        self.text = ""
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                    }
+                } else {
+                    EmptyView()
+                }
+            }
+            .padding(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
+            .foregroundColor(.secondary)
+        }
+        .padding(.horizontal)
+    }
+}
+
+#if canImport(UIKit)
+extension View {
+    func hideKeyboard() {
+        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+    }
+}
+#endif
+
+class addElement{
+    @ObservedObject var data = NewPersonModel()
+    @State var array = [String]()
+    
+
+
+}
+
+struct SearchView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    @ObservedObject var data = NewPersonModel()
+    
+    @State private var searchText = ""
+    
+    var body: some View {
+        NavigationView {
+            VStack {
+                SearchBar(text: $searchText)
+                    .padding(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 0))
+                
+                List(data.nickNameArray.filter{$0.hasPrefix(searchText) || searchText == ""}, id:\.self) { searchText in
+//                    ForEach(array.filter{$0.hasPrefix(searchText) || searchText == ""}, id:\.self) {searchText in
+                        
+                        ZStack(alignment: .leading) {
+                            Rectangle().foregroundColor(.secondary).cornerRadius(8).frame(height: 55)
+                            
+                            HStack {
+                                Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                                    .foregroundColor(Color.random()).padding(.leading)
+                                Text(searchText)
+                            }.listRowSeparator(.hidden)
+                        }
+                    }
+                } //리스트의 스타일 수정
+                .listStyle(PlainListStyle())
+                //화면 터치시 키보드 숨김
+                .onTapGesture {
+                    hideKeyboard()
+                }
+            }
+            .navigationBarItems(leading:
+                                    Button(action: {
+                self.presentationMode.wrappedValue.dismiss()
+            }, label: {
+                Image(systemName: "x.circle")
+            })
+            )
+        }
+    }
+//}
+
+
+
+
+struct FriendView: View {
+    
+    @ObservedObject var model = PersonModel()
+    @State var showModal = false
+    @State var showModalSearch = false
+    
+    var body: some View {
+        VStack{
+            
+            HStack{
+                Spacer().frame(width: 263)
+                Button(action: {
+                    self.showModalSearch = true
+                }, label: {
+                    Image("Magnifier")
+                }).sheet(isPresented: self.$showModalSearch){
+                    SearchView().presentationDetents([.fraction(0.75)])
+                }
+//                Button(action: {
+//                    self.showModal = true
+//                }, label: {
+//                    Image("Group 44")
+//                }).sheet(isPresented: self.$showModal){
+//                    SortView().presentationDetents([.medium])
+//                }
+                Button(action: {
+                    ScrollVertical().toolbar {
+                        EditButton()
+                    }
+                }, label: {
+                    Image("so-trash")
+                })
+                
+            }
+            Divider()
+            ScrollVertical()
+        }
+        
+    }
+}
+
+
+struct TrashView: View {
+     
+    @State var numbers = ["Record1","Record2","Record3","Record4","Record5","Record6","Record1Seven","Record1Eight","Record1Nine","Record1Ten"]
+    @State var editMode = EditMode.inactive
+    @State var selection = Set<String>()
+     
+    var body: some View {
+        NavigationView {
+            List(selection: $selection) {
+                ForEach(numbers, id: \.self) { number in
+                    Text(number)
+                }
+            }
+            .navigationBarItems(leading: deleteButton, trailing: editButton)
+            .environment(\.editMode, self.$editMode)
+        }
+    }
+    private var editButton: some View {
+        if editMode == .inactive {
+            return Button(action: {
+                self.editMode = .active
+                self.selection = Set<String>()
+            }) {
+                Text("Edit")
+            }
+        }
+        else {
+            return Button(action: {
+                self.editMode = .inactive
+                self.selection = Set<String>()
+            }) {
+                Text("Done")
+            }
+        }
+    }
+     
+    private var deleteButton: some View {
+        if editMode == .inactive {
+            return Button(action: {}) {
+                Image(systemName: "")
+            }
+        } else {
+            return Button(action: deleteNumbers) {
+                Image(systemName: "trash")
+            }
+        }
+    }
+     
+    private func deleteNumbers() {
+        for id in selection {
+            if let index = numbers.lastIndex(where: { $0 == id })  {
+                numbers.remove(at: index)
+            }
+        }
+        selection = Set<String>()
+    }
+}
+
+
+struct ScrollVertical: View{
+    
+//    @ObservedObject var model = PersonModel()
+    @ObservedObject var data = NewPersonModel()
+    @State var editMode = EditMode.inactive
+    @State var selection = Set<String>()
+    
+    
+    var body: some View {
+        
+        
+        NavigationView {
+            ZStack(alignment: .bottomTrailing){
+                NavigationView{
+                    List(data.Friends, id: \.self){ friend in //selection: $selection, 추가해야함 **
+//                        ForEach(data.Friends){ friend in
+                            HStack{
+                                Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                                    .foregroundColor(Color.random())
+                                VStack(alignment: .leading) {
+                                    
+                                    Text(friend.nickName)
+                                        .font(.subheadline)
+                                        .fontWeight(.semibold)
+                                    Text(friend.promise)
+                                        .fontWeight(.semibold)
+                                        .font(.caption2)
+                                        .foregroundColor(.gray)
+                                    
+                                }
+                                Spacer()
+                                Image(systemName: "star.fill").foregroundColor(.yellow)
+                                Text(String(friend.stars)).frame(width: 25, height: 25, alignment: .leading)
+                                
+                            }.listRowSeparator(.hidden)
+                            
+//                        }
+                        //                    .onDelete { index in
+                        //                    }
+                        
+                    }
+//                    .navigationBarItems(leading: deleteButton, trailing: editButton)
+//                    .environment(\.editMode, self.$editMode)
+                    .listStyle(PlainListStyle())
+                        
+                }
+                
+                
+                Button(action: {
+                        print("Floating Button Click")
+                }, label: {
+                    NavigationLink(destination: FriendSearchView()) {
+                        Image("Group 65").frame(width: 51, height: 51, alignment: .bottomTrailing)
+                     }
+                })
+                
+            }
+        }
+    }
+//    private var editButton: some View {
+//        if editMode == .inactive {
+//            return Button(action: {
+//                self.editMode = .active
+//                self.selection = Set<String>()
+//            }) {
+//                Text("Edit")
+//            }
+//        }
+//        else {
+//            return Button(action: {
+//                self.editMode = .inactive
+//                self.selection = Set<String>()
+//            }) {
+//                Text("Done")
+//            }
+//        }
+//    }
+//
+//    private var deleteButton: some View {
+//        if editMode == .inactive {
+//            return Button(action: {}) {
+//                Image(systemName: "")
+//            }
+//        } else {
+//            return Button(action: deleteNumbers) {
+//                Image(systemName: "trash")
+//            }
+//        }
+//    }
+//
+//    private func deleteNumbers() {
+//        for id in selection {
+//            if let index = names.lastIndex(where: { $0 == id })  { //변경해야함
+//                model.people.remove(at: index)
+//            }
+//        }
+//        selection = Set<String>()
+//    }
+}
+
+
+
+struct BetterMeView: View{
+    
+    var body: some View{
+        Rectangle().frame(height: 0)
+        Button(action: {
+            print("홈으로 이동")
+        }, label: {
+            Image("BetterMe")
+                .padding(.top, 17.0).padding(.leading, 18).padding(.bottom, 28)
+        })
+    }
+    
+}
+
+
+struct ContentView: View {
+    
+    @State var tabIndex = 0
+    @Namespace var animation
+    
+    var body: some View {
+        
+        VStack(alignment: .leading){
+            Rectangle().frame(height: 0)
+            Button(action: {
+                print("홈으로 이동")
+            }, label: {
+                Image("BetterMe")
+                    .padding(.top, 17.0).padding(.leading, 18).padding(.bottom, 28)
+            })
+            
+            //            TabView{
+            //                Text("home").tabItem{
+            //                    Image(systemName: "house")
+            //                }
+            VStack{
+                CustomTopTabBar(tabIndex: $tabIndex)
+                if tabIndex == 0 {
+                    FriendView()
+                }
+                else if tabIndex == 1 {
+                    SecondView()
+                }
+                else if tabIndex == 2{
+                    ThirdView()
+                }
+                Spacer()
+            }
+            .frame(width: UIScreen.main.bounds.width - 24, alignment: .center)
+            .padding(.horizontal, 12).tabItem{
+                Image(systemName: "medal")
+                
+                //                }
+                //                Text("earth").tabItem{
+                //                    Image(systemName: "globe")
+                //                }
+                //                Text("mypage").tabItem{
+                //                    Image(systemName: "person")
+                //                }
+                //            }
+            }
+        }
+    }
+    
+    
+    struct ContentView_Previews: PreviewProvider {
+        static var previews: some View {
+            FriendView()
+            ContentView()
+            FriendSearchView()
+            homeView()
+            
+        }
+    }
+    
+}

From b969a18b7a6ebb4b9c27c81c741e70a4033f707a Mon Sep 17 00:00:00 2001
From: insung0927 <78968690+insung0927@users.noreply.github.com>
Date: Thu, 9 Feb 2023 23:12:13 +0900
Subject: [PATCH 2/4] 2/9

---
 .DS_Store                                     |  Bin 6148 -> 8196 bytes
 Better-me-iOS.xcodeproj/project.pbxproj       |  172 +++
 Better-me-iOS/.DS_Store                       |  Bin 6148 -> 6148 bytes
 Better-me-iOS/Assets.xcassets/.DS_Store       |  Bin 0 -> 12292 bytes
 .../BetterMe.imageset/Contents.json           |   21 +
 .../BetterMe.imageset/image 6.png             |  Bin 0 -> 3082 bytes
 .../Group 44.imageset/Contents.json           |   21 +
 .../Group 44.imageset/Group 44.png            |  Bin 0 -> 367 bytes
 .../Group 65.imageset/Contents.json           |   21 +
 .../Group 65.imageset/Group 65.png            |  Bin 0 -> 1094 bytes
 .../Magnifier.imageset/Contents.json          |   21 +
 .../Magnifier.imageset/Magnifier.png          |  Bin 0 -> 539 bytes
 .../so-trash.imageset/Contents.json           |   21 +
 .../so-trash.imageset/so-trash.png            |  Bin 0 -> 428 bytes
 Better-me-iOS/Base.lproj/Main.storyboard      |   41 +-
 Better-me-iOS/HomeViewController.swift        |    1 +
 Better-me-iOS/Social/Data/Agree.swift         |   18 +
 Better-me-iOS/Social/Data/AgreeModel.swift    |   56 +
 Better-me-iOS/Social/Data/FriendDelete.swift  |   18 +
 .../Social/Data/FriendDeleteModel.swift       |   52 +
 Better-me-iOS/Social/Data/HabitAgree.swift    |   18 +
 .../Social/Data/HabitAgreeModel.swift         |   37 +
 Better-me-iOS/Social/Data/HabitDisagree.swift |   18 +
 .../Social/Data/HabitDisagreeModel.swift      |   36 +
 Better-me-iOS/Social/Data/InviteHabit.swift   |   24 +
 .../Social/Data/InviteHabitModel.swift        |   38 +
 .../Social/Data/InviteHabitPost.swift         |   16 +
 .../Social/Data/InviteHabitPostModel.swift    |   48 +
 Better-me-iOS/Social/Data/NewPerson.swift     |   36 +
 .../Social/Data/NewPersonModel.swift          |   48 +
 Better-me-iOS/Social/Data/Person.swift        |   18 +
 Better-me-iOS/Social/Data/PersonModel.swift   |   35 +
 Better-me-iOS/Social/Data/RequestStatus.swift |   34 +
 .../Social/Data/RequestStatusModel.swift      |   41 +
 .../Social/Data/Request_Friend.swift          |   24 +
 .../Social/Data/Request_FriendModel.swift     |   42 +
 .../Social/Data/Request_Friend_Post.swift     |   18 +
 .../Data/Request_Friend_PostModel.swift       |   37 +
 Better-me-iOS/Social/Data/SearchEmail.swift   |   26 +
 .../Social/Data/SearchEmailModel.swift        |   42 +
 Better-me-iOS/Social/Data/SearchName.swift    |   25 +
 .../Social/Data/SearchNameModel.swift         |   42 +
 .../Social/SocialViewController.swift         |   40 +
 Better-me-iOS/Social/SwiftUIView.swift        | 1132 +++++++++++++++++
 44 files changed, 2329 insertions(+), 9 deletions(-)
 create mode 100644 Better-me-iOS/Assets.xcassets/.DS_Store
 create mode 100644 Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png
 create mode 100644 Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png
 create mode 100644 Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
 create mode 100644 Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png
 create mode 100644 Better-me-iOS/Social/Data/Agree.swift
 create mode 100644 Better-me-iOS/Social/Data/AgreeModel.swift
 create mode 100644 Better-me-iOS/Social/Data/FriendDelete.swift
 create mode 100644 Better-me-iOS/Social/Data/FriendDeleteModel.swift
 create mode 100644 Better-me-iOS/Social/Data/HabitAgree.swift
 create mode 100644 Better-me-iOS/Social/Data/HabitAgreeModel.swift
 create mode 100644 Better-me-iOS/Social/Data/HabitDisagree.swift
 create mode 100644 Better-me-iOS/Social/Data/HabitDisagreeModel.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabit.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabitModel.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabitPost.swift
 create mode 100644 Better-me-iOS/Social/Data/InviteHabitPostModel.swift
 create mode 100644 Better-me-iOS/Social/Data/NewPerson.swift
 create mode 100644 Better-me-iOS/Social/Data/NewPersonModel.swift
 create mode 100644 Better-me-iOS/Social/Data/Person.swift
 create mode 100644 Better-me-iOS/Social/Data/PersonModel.swift
 create mode 100644 Better-me-iOS/Social/Data/RequestStatus.swift
 create mode 100644 Better-me-iOS/Social/Data/RequestStatusModel.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_Friend.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_FriendModel.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_Friend_Post.swift
 create mode 100644 Better-me-iOS/Social/Data/Request_Friend_PostModel.swift
 create mode 100644 Better-me-iOS/Social/Data/SearchEmail.swift
 create mode 100644 Better-me-iOS/Social/Data/SearchEmailModel.swift
 create mode 100644 Better-me-iOS/Social/Data/SearchName.swift
 create mode 100644 Better-me-iOS/Social/Data/SearchNameModel.swift
 create mode 100644 Better-me-iOS/Social/SocialViewController.swift
 create mode 100644 Better-me-iOS/Social/SwiftUIView.swift

diff --git a/.DS_Store b/.DS_Store
index 62cf7e099dcfe0f2f963475245489bd895666747..5515be0e3e52a22692a4121009b828026f812320 100644
GIT binary patch
delta 379
zcmZoMXmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD7-OXH}hr%jz7$c**Q2SHn1=X
zPv&9Ku4iG;V@PMnWGKl=Hw;eB&n*CIVqo}m{tu9Z%jM>~xFqG|CjrGc@{ddCKR<rN
z5mi0~uY5rUlG)z{fLa;2AogyyW9ecPK(U*n?a1U+ta2jAmI5^xgDizgAZ$aH;775B
zcfsU^Eb^02u+C&=(b1j!fz3z=%|xI#Cck4dnS6(hhYe^BgzLz}vSD*3&r)VC32vaE
gD<}vz3vzsCp3E=eIoY3wgM$$gx(u7+dFC(!0FA|8G5`Po

delta 147
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{Mvv5r;6q~50$jH4hU^g=(_hcRc?ak{2CNfSE
zp2^JkihuGPVLP_vKYt2y?3w&P*a5*bnH(j;%f#d`vGCerb`B0fW}sm}AixbITtVh;
bEd0(qnP0{eWD5fm#72-K7&gcA%wYxq8TKJy

diff --git a/Better-me-iOS.xcodeproj/project.pbxproj b/Better-me-iOS.xcodeproj/project.pbxproj
index fcd6f5a..7ca3274 100644
--- a/Better-me-iOS.xcodeproj/project.pbxproj
+++ b/Better-me-iOS.xcodeproj/project.pbxproj
@@ -12,6 +12,36 @@
 		280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E572983B25F000A30B3 /* MyPageCell.swift */; };
 		280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E582983B25F000A30B3 /* ProfileEditController.swift */; };
 		280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E592983B25F000A30B3 /* PWEditController.swift */; };
+		3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EA298FCE5E0054096A /* PersonModel.swift */; };
+		3B7049ED298FCE5E0054096A /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EB298FCE5E0054096A /* Person.swift */; };
+		3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 3B9BDE05298FC40000CC0C45 /* Alamofire */; };
+		3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */; };
+		3BA12295298A967B000E38A8 /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = 3BA12294298A967B000E38A8 /* PopupView */; };
+		3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */; };
+		3BE30E58299535A9004B3F23 /* Request_FriendModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */; };
+		3BE30E59299535A9004B3F23 /* Request_Friend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E41299535A8004B3F23 /* Request_Friend.swift */; };
+		3BE30E5A299535A9004B3F23 /* RequestStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E42299535A8004B3F23 /* RequestStatus.swift */; };
+		3BE30E5B299535A9004B3F23 /* SearchEmailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */; };
+		3BE30E5C299535A9004B3F23 /* HabitAgree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E44299535A8004B3F23 /* HabitAgree.swift */; };
+		3BE30E5D299535A9004B3F23 /* SearchName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E45299535A8004B3F23 /* SearchName.swift */; };
+		3BE30E5E299535A9004B3F23 /* AgreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E46299535A8004B3F23 /* AgreeModel.swift */; };
+		3BE30E5F299535A9004B3F23 /* SearchNameModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E47299535A8004B3F23 /* SearchNameModel.swift */; };
+		3BE30E60299535A9004B3F23 /* Agree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E48299535A8004B3F23 /* Agree.swift */; };
+		3BE30E61299535A9004B3F23 /* SearchEmail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E49299535A8004B3F23 /* SearchEmail.swift */; };
+		3BE30E62299535A9004B3F23 /* RequestStatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */; };
+		3BE30E63299535A9004B3F23 /* Request_Friend_Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */; };
+		3BE30E64299535A9004B3F23 /* FriendDelete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4C299535A8004B3F23 /* FriendDelete.swift */; };
+		3BE30E65299535A9004B3F23 /* FriendDeleteModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */; };
+		3BE30E66299535A9004B3F23 /* HabitDisagreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */; };
+		3BE30E67299535A9004B3F23 /* InviteHabit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E4F299535A8004B3F23 /* InviteHabit.swift */; };
+		3BE30E68299535A9004B3F23 /* HabitAgreeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */; };
+		3BE30E69299535A9004B3F23 /* InviteHabitPost.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */; };
+		3BE30E6A299535A9004B3F23 /* NewPersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E52299535A8004B3F23 /* NewPersonModel.swift */; };
+		3BE30E6B299535A9004B3F23 /* InviteHabitPostModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */; };
+		3BE30E6C299535A9004B3F23 /* InviteHabitModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */; };
+		3BE30E6D299535A9004B3F23 /* HabitDisagree.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E55299535A9004B3F23 /* HabitDisagree.swift */; };
+		3BE30E6E299535A9004B3F23 /* NewPerson.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E56299535A9004B3F23 /* NewPerson.swift */; };
+		3BE30E6F299535A9004B3F23 /* Request_Friend_PostModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */; };
 		BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE26CD07297805A900E97A05 /* AlertViewController.swift */; };
 		BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */; };
 		BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */; };
@@ -39,6 +69,34 @@
 		280F5E572983B25F000A30B3 /* MyPageCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyPageCell.swift; sourceTree = "<group>"; };
 		280F5E582983B25F000A30B3 /* ProfileEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProfileEditController.swift; sourceTree = "<group>"; };
 		280F5E592983B25F000A30B3 /* PWEditController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PWEditController.swift; sourceTree = "<group>"; };
+		3B7049EA298FCE5E0054096A /* PersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonModel.swift; sourceTree = "<group>"; };
+		3B7049EB298FCE5E0054096A /* Person.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Person.swift; sourceTree = "<group>"; };
+		3BA12291298A94EA000E38A8 /* SwiftUIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIView.swift; sourceTree = "<group>"; };
+		3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialViewController.swift; sourceTree = "<group>"; };
+		3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_FriendModel.swift; sourceTree = "<group>"; };
+		3BE30E41299535A8004B3F23 /* Request_Friend.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend.swift; sourceTree = "<group>"; };
+		3BE30E42299535A8004B3F23 /* RequestStatus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestStatus.swift; sourceTree = "<group>"; };
+		3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchEmailModel.swift; sourceTree = "<group>"; };
+		3BE30E44299535A8004B3F23 /* HabitAgree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitAgree.swift; sourceTree = "<group>"; };
+		3BE30E45299535A8004B3F23 /* SearchName.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchName.swift; sourceTree = "<group>"; };
+		3BE30E46299535A8004B3F23 /* AgreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AgreeModel.swift; sourceTree = "<group>"; };
+		3BE30E47299535A8004B3F23 /* SearchNameModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchNameModel.swift; sourceTree = "<group>"; };
+		3BE30E48299535A8004B3F23 /* Agree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Agree.swift; sourceTree = "<group>"; };
+		3BE30E49299535A8004B3F23 /* SearchEmail.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchEmail.swift; sourceTree = "<group>"; };
+		3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RequestStatusModel.swift; sourceTree = "<group>"; };
+		3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend_Post.swift; sourceTree = "<group>"; };
+		3BE30E4C299535A8004B3F23 /* FriendDelete.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendDelete.swift; sourceTree = "<group>"; };
+		3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FriendDeleteModel.swift; sourceTree = "<group>"; };
+		3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitDisagreeModel.swift; sourceTree = "<group>"; };
+		3BE30E4F299535A8004B3F23 /* InviteHabit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabit.swift; sourceTree = "<group>"; };
+		3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitAgreeModel.swift; sourceTree = "<group>"; };
+		3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitPost.swift; sourceTree = "<group>"; };
+		3BE30E52299535A8004B3F23 /* NewPersonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPersonModel.swift; sourceTree = "<group>"; };
+		3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitPostModel.swift; sourceTree = "<group>"; };
+		3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteHabitModel.swift; sourceTree = "<group>"; };
+		3BE30E55299535A9004B3F23 /* HabitDisagree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HabitDisagree.swift; sourceTree = "<group>"; };
+		3BE30E56299535A9004B3F23 /* NewPerson.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewPerson.swift; sourceTree = "<group>"; };
+		3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Request_Friend_PostModel.swift; sourceTree = "<group>"; };
 		BE26CD07297805A900E97A05 /* AlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewController.swift; sourceTree = "<group>"; };
 		BE532E732975A41800DDA6EA /* BadHabitDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadHabitDetailViewController.swift; sourceTree = "<group>"; };
 		BE5F4EC1296D8F640064A93C /* RemoveBadHabitViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveBadHabitViewController.swift; sourceTree = "<group>"; };
@@ -67,6 +125,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3BA12295298A967B000E38A8 /* PopupView in Frameworks */,
+				3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,6 +145,49 @@
 			path = MyPage;
 			sourceTree = "<group>";
 		};
+		3B9BDDF3298FC2EA00CC0C45 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				3B7049EB298FCE5E0054096A /* Person.swift */,
+				3B7049EA298FCE5E0054096A /* PersonModel.swift */,
+				3BE30E48299535A8004B3F23 /* Agree.swift */,
+				3BE30E46299535A8004B3F23 /* AgreeModel.swift */,
+				3BE30E4C299535A8004B3F23 /* FriendDelete.swift */,
+				3BE30E4D299535A8004B3F23 /* FriendDeleteModel.swift */,
+				3BE30E44299535A8004B3F23 /* HabitAgree.swift */,
+				3BE30E50299535A8004B3F23 /* HabitAgreeModel.swift */,
+				3BE30E55299535A9004B3F23 /* HabitDisagree.swift */,
+				3BE30E4E299535A8004B3F23 /* HabitDisagreeModel.swift */,
+				3BE30E4F299535A8004B3F23 /* InviteHabit.swift */,
+				3BE30E54299535A8004B3F23 /* InviteHabitModel.swift */,
+				3BE30E51299535A8004B3F23 /* InviteHabitPost.swift */,
+				3BE30E53299535A8004B3F23 /* InviteHabitPostModel.swift */,
+				3BE30E56299535A9004B3F23 /* NewPerson.swift */,
+				3BE30E52299535A8004B3F23 /* NewPersonModel.swift */,
+				3BE30E4B299535A8004B3F23 /* Request_Friend_Post.swift */,
+				3BE30E57299535A9004B3F23 /* Request_Friend_PostModel.swift */,
+				3BE30E41299535A8004B3F23 /* Request_Friend.swift */,
+				3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */,
+				3BE30E42299535A8004B3F23 /* RequestStatus.swift */,
+				3BE30E4A299535A8004B3F23 /* RequestStatusModel.swift */,
+				3BE30E49299535A8004B3F23 /* SearchEmail.swift */,
+				3BE30E43299535A8004B3F23 /* SearchEmailModel.swift */,
+				3BE30E45299535A8004B3F23 /* SearchName.swift */,
+				3BE30E47299535A8004B3F23 /* SearchNameModel.swift */,
+			);
+			path = Data;
+			sourceTree = "<group>";
+		};
+		3BA12278298A9340000E38A8 /* Social */ = {
+			isa = PBXGroup;
+			children = (
+				3B9BDDF3298FC2EA00CC0C45 /* Data */,
+				3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */,
+				3BA12291298A94EA000E38A8 /* SwiftUIView.swift */,
+			);
+			path = Social;
+			sourceTree = "<group>";
+		};
 		BECC4B2C296C3AB60037807F = {
 			isa = PBXGroup;
 			children = (
@@ -124,6 +227,7 @@
 				BEF940BD2972827900D0F1FD /* Habit.swift */,
 				BEF940C1297561FB00D0F1FD /* BadHabitCell.swift */,
 				BE26CD07297805A900E97A05 /* AlertViewController.swift */,
+				3BA12278298A9340000E38A8 /* Social */,
 				280F5E542983B23A000A30B3 /* MyPage */,
 			);
 			path = "Better-me-iOS";
@@ -145,6 +249,10 @@
 			dependencies = (
 			);
 			name = "Better-me-iOS";
+			packageProductDependencies = (
+				3BA12294298A967B000E38A8 /* PopupView */,
+				3B9BDE05298FC40000CC0C45 /* Alamofire */,
+			);
 			productName = "Better-me-iOS";
 			productReference = BECC4B35296C3AB60037807F /* Better-me-iOS.app */;
 			productType = "com.apple.product-type.application";
@@ -173,6 +281,10 @@
 				Base,
 			);
 			mainGroup = BECC4B2C296C3AB60037807F;
+			packageReferences = (
+				3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */,
+				3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */,
+			);
 			productRefGroup = BECC4B36296C3AB60037807F /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -200,26 +312,54 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				3BE30E64299535A9004B3F23 /* FriendDelete.swift in Sources */,
+				3BE30E5E299535A9004B3F23 /* AgreeModel.swift in Sources */,
+				3BE30E65299535A9004B3F23 /* FriendDeleteModel.swift in Sources */,
+				3BE30E6D299535A9004B3F23 /* HabitDisagree.swift in Sources */,
+				3BE30E67299535A9004B3F23 /* InviteHabit.swift in Sources */,
 				BE5F4EC6296E7CC90064A93C /* SearchFriendViewController.swift in Sources */,
 				280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */,
+				3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */,
+				3BE30E5D299535A9004B3F23 /* SearchName.swift in Sources */,
+				3BE30E62299535A9004B3F23 /* RequestStatusModel.swift in Sources */,
 				280F5E5B2983B25F000A30B3 /* MyPageViewController.swift in Sources */,
+				3BE30E6E299535A9004B3F23 /* NewPerson.swift in Sources */,
 				280F5E5C2983B25F000A30B3 /* MyPageCell.swift in Sources */,
 				BEF940C029753F8500D0F1FD /* GoodHabitDetailViewController.swift in Sources */,
+				3BE30E59299535A9004B3F23 /* Request_Friend.swift in Sources */,
+				3BE30E6B299535A9004B3F23 /* InviteHabitPostModel.swift in Sources */,
+				3BE30E5C299535A9004B3F23 /* HabitAgree.swift in Sources */,
 				BECC4B4D296C3E1F0037807F /* AddGoodHabitViewController.swift in Sources */,
 				280F5E5D2983B25F000A30B3 /* ProfileEditController.swift in Sources */,
 				BECC4B3D296C3AB60037807F /* HomeViewController.swift in Sources */,
+				3BE30E66299535A9004B3F23 /* HabitDisagreeModel.swift in Sources */,
 				BE26CD08297805A900E97A05 /* AlertViewController.swift in Sources */,
+				3BE30E68299535A9004B3F23 /* HabitAgreeModel.swift in Sources */,
+				3BE30E60299535A9004B3F23 /* Agree.swift in Sources */,
 				BECC4B39296C3AB60037807F /* AppDelegate.swift in Sources */,
 				280F5E5A2983B25F000A30B3 /* HeaderView.swift in Sources */,
+				3B7049ED298FCE5E0054096A /* Person.swift in Sources */,
+				3BE30E6F299535A9004B3F23 /* Request_Friend_PostModel.swift in Sources */,
 				BEF940BC29727FC600D0F1FD /* GoodHabitCell.swift in Sources */,
+				3BE30E69299535A9004B3F23 /* InviteHabitPost.swift in Sources */,
+				3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */,
 				BE6AF7F0296ED4EF00C236F8 /* FriendCell.swift in Sources */,
+				3BE30E6C299535A9004B3F23 /* InviteHabitModel.swift in Sources */,
+				3BE30E5F299535A9004B3F23 /* SearchNameModel.swift in Sources */,
+				3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */,
 				BEF940BE2972827900D0F1FD /* Habit.swift in Sources */,
+				3BE30E63299535A9004B3F23 /* Request_Friend_Post.swift in Sources */,
 				BE5F4EC2296D8F640064A93C /* RemoveBadHabitViewController.swift in Sources */,
 				BECC4B3B296C3AB60037807F /* SceneDelegate.swift in Sources */,
 				BEF940C2297561FB00D0F1FD /* BadHabitCell.swift in Sources */,
+				3BE30E58299535A9004B3F23 /* Request_FriendModel.swift in Sources */,
+				3BE30E5A299535A9004B3F23 /* RequestStatus.swift in Sources */,
 				BE6AF7F2296ED62400C236F8 /* Friend.swift in Sources */,
 				BE5F4EC4296D9E090064A93C /* Quote.swift in Sources */,
+				3BE30E61299535A9004B3F23 /* SearchEmail.swift in Sources */,
 				BE532E742975A41800DDA6EA /* BadHabitDetailViewController.swift in Sources */,
+				3BE30E6A299535A9004B3F23 /* NewPersonModel.swift in Sources */,
+				3BE30E5B299535A9004B3F23 /* SearchEmailModel.swift in Sources */,
 				BECC4B62296C6B010037807F /* EmojiTextField.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -438,6 +578,38 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/Alamofire/Alamofire.git";
+			requirement = {
+				branch = master;
+				kind = branch;
+			};
+		};
+		3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/exyte/PopupView.git";
+			requirement = {
+				branch = master;
+				kind = branch;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		3B9BDE05298FC40000CC0C45 /* Alamofire */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */;
+			productName = Alamofire;
+		};
+		3BA12294298A967B000E38A8 /* PopupView */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */;
+			productName = PopupView;
+		};
+/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = BECC4B2D296C3AB60037807F /* Project object */;
 }
diff --git a/Better-me-iOS/.DS_Store b/Better-me-iOS/.DS_Store
index 3e6ed110d3cb91d12127a9d99fb88588195bbc83..01da1c6b8a10bdd734471eff84f3c52cdbb2e4cb 100644
GIT binary patch
literal 6148
zcmeHK%Sr<=6g_E+mb$P@(an58(Lb1$b}0y52(Gjbs?svWD(G%LLv&UA5<$i9&>s+7
zx%1p4lxEthxF{m`!p+Gf_a-L?l1u=Y+C^svC<7?c1q&q>b4>chXDsJiB-z+8&M`s-
zmuTZ?CR!U*0af6yDIj}y9aZkz5xSV(zmt}JZ>QN#2183dfBW%$#vrNJTm7WPNI5t*
zub&>OKgsI+B5Qa&#cnm?G$^6Q^GDWGK_5e$A;D>|irmY1QCx<5<KWS9pF8Ft2^fDF
z8}Q7%3C|Vm;tG4@+Cw+shw6K_Kf`PMdT)6JV`TWujR|;A96L{w3bk=UCjF4d&3?8&
z<dJUOJ$oKgV}v~B#{@jgw(w9}t^&NX#fobVwNwRE0aak4fSeBzT`=~TI<!Xz3;P5h
z7T9c!^|Dlmk;m9$>X1D&<5Gz()%Yidap`Q2d|d1?b?DMz{Nuy;nT>y;7&|-1k8C(h
z>`+TpKotlT$h*(7-2aWm@Bc7Kzf=KL;9n_V3iW2a#wGc?b!KsL*GBY1x|qbJ4s8kx
ie;wP3T*Vu7YwU}pLX1784%tG}9|0?a7OKEf75D_voR!@G

delta 325
zcmZoMXfc=|#>B`mu~2NHo}w@l0|Nsi1A_nqLvd1haY0f}e$vFkm6HubSn63B+!*p1
z@)$}GQb5H!k_vJ%i%Sd)t}!w(v#_$UbFg!8bHoN`<d+ARB$kvGJ0%uHgLonN`8i22
zc4AUkW@>r7fQWN`UP)qRUTP6oLuN`UP)SU9W?o8uxl?{=UP>`oZ!l0I3n;_E$-x;f
zAW>ayXkn_OU}R`otD{hDX=I?IU}9`mTg%BIs;qAv6rY`wo0s1ObQ};c0(}DpyigiO
zbpshlUMdSN%FD^mO9zTFZWiPaW7*j7lW{XU2R{ceaDW2enJ4p$SOUWZ96q360)-RH
J<_M8B%m5xOP_O_1

diff --git a/Better-me-iOS/Assets.xcassets/.DS_Store b/Better-me-iOS/Assets.xcassets/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..532bd4eb357409e38dcd92677d0231bd061830c0
GIT binary patch
literal 12292
zcmeHN&rTCT9R6)75hEC&V9?VZ^`MbN@!(~FqL7FlIG{I6i-p*B8(M;im)<=11|AH&
zfj)wXzJv#3q9>ohgWt?9%g%PD`<p$OC^MUx*-rPHneUtbe~8FiIczKvT_>UmSm94k
z!g)jFUxJ@9;(uX>%osvE*r%{~pC;O;KCRFp-2Twl!vQ4(349s0LTl7e@F8{R7DC!o
zqbBWA54PWGE^gJsb~lQw{GR4$nd*3U@pYe8DWn$c0g(0NT_W3IwYt*^cYqXRPNEo`
z>lAPbI0c*nPJwf$fEasWCNkrF6zW{3fK%XHD<Jv@A6EE5><=Peb{%lU6khx<rts3>
z9qRxY=Er^z`-8}rP+%k!egyU6C59Kl5$=o6;Rmrli2MjnUIZsEPT7lBD4t9mIA4BF
zUJ&`tbqY8Ih84JnAm-XTyMq4l>GQG;x}mJU?a<x5^twL~Jm%>E*7^H#<=;ql9T>X?
zmqo5E&<5UCF=)A4#Gv6nLl40}#BNI$edQfIIlCpL6YyrBRK9~>+h1fkvyf??Hb|A9
zkBnw=x<q&L_>I5fp;-L1>9s=!KP^(jZ-LfPdTrF-(;c&@?!G{sZsEx(&B?D|YaNHm
zolfFbSRkIX62;?DbqPQTy^&s*kvoA?>wKg^17^Bv9Y~ln(Hg!psXb1g7V(TOdGGfP
zaAlwjJXuI>=`xTCzmkuPVm^0Pay~8Pu%jp6IT!=C+_Vg(my1()p~Ho_MjP0ZUZp*>
z;5xlTE3Qeu8TZN^>}QWINxJa1Xgmh~h4N(3q)=R{PJz&AKBLn{vZJ4)&J@lkY|sWx
zEYde9VG)Cd|153F6O0bpf#}<J<>|y(o6wwVj6DW(7Ea}yjJQl}x|Q2uRh~Ywiyo<m
z@$4o}VGh8zhjx)uzNK$Glz}57J+(X&h76>J-yCg&-vLHutJ&riu~21WRj$eCVu4SW
zsXboh9U$u%kDsB=iWx~rN3@0Vt>xF?iyj|o;LJ={E#rhS6RqJZI6LDMI3Ei5pvgW%
zS5M#RwGGzL%Gqff+BqAqwsg5mIE%XjT|67|u7J30P?Nv+<KLQ*nLdIu3uoZV#A<tS
z7FNUaDtI2rUOPK-G1r=v4`5v&7J~+bV$v#7ASP9x0K{bd*XuKKmR9N6U=3P``pZgt
zMEz&sHN0oAX2G2rJYr6|2{&iPHgzA287P%&YTlKbp32e&sq*uYQLG)Z={>?6rU{$F
zbLXcWTIHL}K`hc&c^8R6<v)n{H{{GslyP>KX>`qgC;79{M*bEtXxsNZ=GtQJ$zY)J
z4+Q@O!<{l_uU9@U5{E$x>%16hgmpYax}4U1qH!S-?*57M|26adKlzb!oB~dP|5E|4
zT-~a!fSXvf>x|gK@L`|Bo*H~BKZhfa;^E7qc=+-t9{%mrw}E&^*dX%p2J_c10l4wM
ZkJ(S|z3Pe^|4}>3$8fC2+ka*J{{t;79l8Jj

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
new file mode 100644
index 0000000..2548403
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "image 6.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png b/Better-me-iOS/Assets.xcassets/BetterMe.imageset/image 6.png
new file mode 100644
index 0000000000000000000000000000000000000000..af8e9c44dcee284565ced93f1b9ff60c40bff69f
GIT binary patch
literal 3082
zcmV+l4E6JgP)<h;3K|Lk000e1NJLTq004gg000~a1^@s6NZnxP00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH3!h0uK~#7F?OF+t
zRK*$o`puh}z1Vw~6+{6+(bdw#7_CS&Dhi~`QSnGDV~m!uJgBIZ(j=N_s)8oQcwk|b
zl_*vWDMex`QVEcQqeud3KtVwTxvv6tXP0HzYu?fM`pwnv&AdIrVyrkn^>*It{`>F0
z|L*^6fD)9T1SKfJCkRCLMUF?Alf+CZaJJqa0LKvMa2;$-)?!Wlc68x5fIJc9b{{Sf
z615SDWugN|isCh3Y|6leZVGG5yRaQ4`0v1Kzz_MjeB=-wh4+qCkIQi!z;49#nR%T4
z1}s#EA&8T#LbKI~HpNS-0lRx^aWYCUEHKm`sWe?;2EsKy2nz2k{{0g->dP2ma3rqE
zyc)DLU+V2aV-Tmj95czYY8PZ?T*N#+2l4+Iyv;`|qTI*|y@Lm0H`_L=hpym53V0Wr
zlY#LuDKY!NXjEbZflO6vjKqaQ{sQ2-s0lQULJ5WihW0K39Y2n?V~ToW?Km}(z$DYg
zr`Yu{yt9!TbXtvr&tL?Bhb`j!j2E#;(#N}RKnaEh=1>tSeVgIkHU@^XEe3}C{<Lc6
zDTvWDw}g$8Ef{avm|;k?x@qk^%+39GUm2Fv>_vwUm($qI_#7NG=~EjvE@FH!(VT#l
zVjV2mgh_M_ty1QZ_<g3`gqe{jHi`YTT0uUVP(_@JIpzZLKGqem8BlI@O)QBY#Jk0K
z@2W<9MHJuXYs!pc4lYEewH)8%sXLETckx*iOW+L*0=>=TUE)@_IAXeZMs#v)6Iv{Z
zE7{#jek@mFO{^SC#a{G!{5E4W`JG9A&*Z1UAbVYG3|<qPa5QWlCBME#Tx?1&Se`)j
zh;aM?b}cs(lpPIb;h<K;7&xufgF3qb-wK%^%8hti5B|82sRejsKGlc??C%c=8rvDD
z-61vW!#STBD9B|0@B5lCgYUhecnks=Bu>$JAs@G~?_d~R_P^9qj}wDyAgxz&@~Fey
zR6SlUGX7^OQ^Ej1I!iRU&gHsi@jV%&MLyPYeUt5a+{Ev$BK=!>M&p8_b8ruc^ZEb*
z`X;Lx7fQ{-8yF&}L9!mzZUb(EiW2f28>r7d%{j`Aw;cSLr|(*R#zIIokc&AC81K%|
zXI6*F2nRunF)=E=xyuG%v_Tpe@4bEjrc;jxX?339XLA@`^7)OZz>9KBKCqOH7)7l)
zEB9^SX7YPgk@2&7lV}K`jRa*zp2p|d!%d{~C||1z7?C*FaIu){oC7`X$@fo=*?37#
z^7m00rwbR0_<DW_8*0PPphaEGgOxixp=O^9+{F`nb#|mJQAWm3=KHCd2TqW}y+X_P
z)h1dlo+Qe-THE`EfnQ1o`)PMBrJJ}XGq=gk*+-kOT(n_*O5#DbwG($51>dBxzLMYD
zxj}R3-1j;*#&Fzpp&dfb@gDKk^YtI`8mvGY(DyD)puj`OAM#$}JnOjlD``!1K;Dtt
zm`hk&xR1a0d0&n)nuzD48>XA-bz6LT_|#-%vvFS?+9`>mP%j}Y12K`OQ<0JH1|G@{
z{QWHFn37*ACS`sT{IiV1)LN%%>m2WNd70TO-ghl(Z3FWupE^xmi#gwO5rH`O?R#v=
z#$?r;?+K|6OSX1W%<K>0>Fz6%=B1i&4*PmEyhO6a=fgqsc^BJLIdj&4=XLW>^R_}a
zS$)korC^?V+^zHDG<pZh2h@mv`OJF*ZrA&%-KWv=9MW(Os=|@iSBDz*Z4a#Z135Zv
zL5Me{zX@Mg)(`_g2kCG<+X8eJW!J0bv-~_r#S`a0DNBQ{Vrjs&J(TTJ>kiOfsP;3r
zM!s|1t9|aXHob2{Hv2`Of`P?6ZuWQeMw*}LfL4?-@as_rlpf|GT7h5jWbf0OF2%%=
zP1R%#H9_RfAm`g2t;EYZj%debTB7+{Q?p|*;0&V)JR%O_kT*7g58`cD5LSK6LS2zI
z&N(j|e38yRzP<0`3wV}6;cji-RX#p6Ehmv_zP>1a!Jsgeqs4bxn8$tOBe+7ngqnR;
zPM#;>*Yi|8)72sjFJitZ-9*3b;whe{s%Qd_WZGJVf2HT}<jvKatX}Wb#q!*sx;yC|
zm=P-%TP98wS_VkI%B^nvG!^j9T+`|Bu}d>s9J-?>-oh}U69vw_JLY1mj|T%uJ#(>z
zKZc^Ll7TQipV>;EpO<t>H*<|Q>c|{hEqq96>lU8sNvvWT^I}1>s=N1kCidYh?>s1X
zGYENHY(>9-zgR?2zIl2fc?|^iR#xJ$-##20I0EISZxW0lA9oHijP4U#iuMS`3vxs_
zwECn!U6TQE7*0VktuRH)gKk_@wevO%1`;2tpCRY@IqJ+q>G$T?c5d^P8EUjTy$hi?
zsY#afmt^)*phZoitI~6cO%&{7Vki1Ag1|t}@rxAQM!HH_j1Q%FZ45N$N80eWq6C#r
z+36ho7=a<+fSZ{PgNIJdA-$~oW>VsJAv$o<ZvOne*GjvAVQ;>Ic1FUr>C>9qW}2>a
z`W0d1t1XQOVYU(R`PCeBrC`=YIc^+_J?$7#VEMOQ4`|5jJ4PL&<Rpa^0EO2rQB^6?
z?G>{^NRrdAzW*6ezWcO{MfM3ytB4d=HpAo!;;^eT+1aoIJ{6@heVGM+Iat_{On{>D
ze!T;@j6qU&@KJqL2A*Qtwb9;z2Ykf`>DP?7EK=SLXpbAH@Ww`A2ege;X<>gCnv3z`
zIJm6L!FpENR?4yAIXk5_bdCJzV72xx;x49!$h(>DdYRRQ^~@G7R>+~7&+_NzSuVXX
z`!K4%nN_6wnT9N*pl1ir-z-0Xo$4j!;xCkR-Zx5I&GA?3$m;slwphvpzO7saxtON&
zLJ8|WQIKY<s-mfsPnBss#*G5MIhk=sT$N3kevMOZL}qf~3{<nU`j|W^?<3_ktVuNB
z2jt;Z;<j+}&$0Rn)5?!ENG#XBglpi@-Wujk+3ugfV9Gm#CH58Em$Nfg;yl%tHv5}Y
zUCeLN=(}&BP;SY6hfOZfMIv`(KPx)0r@tPvSjhQZhQ5$47E;J>kj54Y`2@CIg1n|m
zMk#Xy^5$6GAnGc{Q}IVT=?#!%a$Q>^F0}-9n|^+8wL9@0Z#e7rEXRI@*Sz<z(m0iU
zC#B_tui8gh24x*Vt;bpJ6;Dpk*0MA@nuVf}g3Yje@c>XJ0`V>_ov*<jBqq=T#ApZR
zG1vbZ_v(uoS`*AD-lM!%5$TZqG%w=>P8XRiRJXM(aCvUn(>8UnAk+~U9!OPnqshFE
z{@RxU#X7K%gjGhM`=0YT@eN4lrP+;F0o2bKWW5@oy&NbiXcf)2G)7QfW@0rF_5}Mg
zzov*#`<auo!gVeA+^AtRlJYfDJ^787{P$1ZTHcw<kt>nnq3zPfC1~4H7$($>K`-4{
zyT;&AZmlnxcj3Q?q96CAywYD2Q8W%{?=q6Y4gCFsHXzQwm$U79BAkJ&Tm%l$V&2Yb
zsy9A=sUlc!7I@7ok+Sp{^1P)|Kr-`!s&yZZ;Ow$aED;5n8yQMqE*EhLpXb=*yS?KM
zCY6>^bFbuW(*wcVrp*Z~=Fh{zZ~hhCZA83ZZ7Of>REbq>U@-SqLE8&P6@H^WDtPP0
z^6C||ME4?nz;#}g#;Kh8M`k^yiNpD9KxH-L^C_gG^B!u{lLCWkWC5td#Dlf~>9M@X
z!(7gDSjV9?`z`W{vN}2*Z|nULRjvlsWMr_*jNp0S97oW>E5@71?{!kuW(4~6ex)RQ
zo;DqvXSR8=MTXY#2k)w}4&!L<M)gO~&&t>i-OLX#E<!y$CFOv15gaM+EWD~!(8CgG
zxr@4f)1$qMv_myim19!^V`FJ;-#=J|jwRqRH20P`aBMlgy6mcqBO>--f3be`A7W}*
zM2jE7&SJ8mEKHV@C&VkUXRx%GxN#PtPfXb;vm!`Tw&9?_$1+$gK?zDwf)bRV1RnwX
Y2iTP}ka2yW1poj507*qoM6N<$f_sJPQ2+n{

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json
new file mode 100644
index 0000000..1d0dfcc
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 44.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png b/Better-me-iOS/Assets.xcassets/Group 44.imageset/Group 44.png
new file mode 100644
index 0000000000000000000000000000000000000000..4be4b5b9efe13c0dd3f171abd2b81877ce1950bf
GIT binary patch
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^GC(ZM!3HFoqjMdB6lZ})WHAE+w=f7ZGR&GI0Tg5`
z4sv&5Sa(k5C6L3C?&u3txv`)7Pa-Q&j>Xf(F{Fa=?Ul2<O$H+DADFl;xRhV8?P63p
zFqgB1bH`+XM=ZM<^Ar|WJU{*2JlAPM=Il$&?Dv<-uYaqb`RmjS$1S<iyCRxD@bX#t
zU;g5<I%4zl>@6$u8$@3$4qe!hC{cDsOk~FMO4(x>z5&_+37>7^IZhdx_a*mz4Ew^p
z=Czeb#3YrAM(rP&OsiC)3{G$A<Fj46QPt~#V&CJwoeV!0nqOUJ;wyi~XiMrttA7vP
zH~ctf@>98(^;6VdbKlFSKFwJECp2tzm_pW6KAn})YXj}v)=t|LwRK<6s-sQ|z66HM
z;BHzVB=Koe?QFST2hKk+vQeUGEZ=JXC$VY#vN~h&!6Rmk;~vI{x}!B|2I`r>@L}+D
L^>bP0l+XkKD58(N

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json
new file mode 100644
index 0000000..95cd3ab
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Group 65.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png b/Better-me-iOS/Assets.xcassets/Group 65.imageset/Group 65.png
new file mode 100644
index 0000000000000000000000000000000000000000..37749643d4a00930ff0289e1545c0b24d382b8e7
GIT binary patch
literal 1094
zcmV-M1iAZ(P)<h;3K|Lk000e1NJLTq001)p001)x1^@s6I-xKs00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1KUYNK~#7F-I~2}
z+eQ$_cMk`SGIoK&bkbx3KY{5sDXcs}<SrdGlRlP;w2729MXdChp}KU|8(1!q*31)_
z8aIh$&tUwiAr80RJ&7<)K_Z9`3gE91aX5kZ=kD#^?E#@8C=3E~@}>s~d<RG&0rjLE
z3B##w5%(Mc;)w733knYP+Vvrhq6jJgp#&lzK6$-?3H13=1|L8%4hdktbDRvI1ck&n
zE4+Jk9|*UgxPYv|j0kC<Rc9anI~l=(EG%Z+Rre8a2PzaXi-<Cc_SXKl4;K8te7yf+
zE!2s52xoI)8Hgy)^S{k&C6%X>>3V&g#7~wfMBsT88vfps&(&6*{&U5|H`Oov&;iuw
zR&xkEi@(b_=5@T(&D;aX&5ve)wBtXwyBFTR=tkp&Ot?f)rkJycwNNBkCOqg(eVpuP
zw13KJ)RM`5WpgACk@oyMvr+C`0PvFd5j0zf5SV2AaJKOiF{kbYA+!SQ&4%pM&BVRL
zD(w;Di1fAO7B5@fLN&FFw&Q-wgb2Jw)Twn+%Z$6;)4If{@B8kr{c9g;AhnK`D;Ba@
zrx5kWpXqfCf`a6&zrmSt;M|Ob^r0@k{3`o%g%DUbeno)`!|Tv)dK5yS%$i>6O1LHh
z^G5d+*w$O+6od^HL$_fCuv|n@Qb~aoz$3WL(F{Xa5isturV_Y>cuB~`ukQkWbJu;Q
zzaInr^Z4S2Jv%Cuhf0Z=O^8)sfBd1apj-uwwxGF;I^tbr2n9%g!DhJG>DsIe^S)gD
z^z%nCEX4lyE7StluN4=zhp+-zpd-#Rcmyi|3mGb2avs1cVBt_{W5mrWIUl)7^mQ{-
z7&##=pEr0YJ585o<e&#y45t@2ekaC{6PY*lxZ1O$?9UZ}2&2h~o69reYVl3n1ERT=
z_C=Y_Lv<81$YT1?v^pc(XXATMq50L!6tRk@5<ZNAkzA*1GqDa4?Lv#NR_#rM2<Hmt
zaaTQ&(kC<=v5J14+?sAXw`w+?y$8+DJCV58Y~wjGpRw6ERBuCrAyT{3?lmEEKjT6j
zVKe6skE`<{&O8Xa{7mzP-r<5r<>9(8EX03db}qU-_dS5d2$~~A$n{dg_=eg-L=kiq
zIVd8lwmUE5!Mu(OyrBW1XT3*A%RIxuq4vzZtjV55?t+Fyxemv5PORI6`5s;ZPT*?W
zKQ?#r3K4Q!W*V`QHhPm3^((ei#B*bh_a+Y}M|+D<NX#^62UT)DvJS<F#GPar?_Wy}
ziins{TFeAFACY4PcHDJWj7JPz>r~K~xF=c|64xHsst2+|EF)l=4|^+xd&^O2a{vGU
M07*qoM6N<$f;)Kl=Kufz

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
new file mode 100644
index 0000000..15595a6
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Magnifier.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png b/Better-me-iOS/Assets.xcassets/Magnifier.imageset/Magnifier.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b20326b75e0f165c551042a89f352b7d6e54a47
GIT binary patch
literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0kBC#K~#7FwUyg-
zf<O?42eklFLDE661MMIkcsu&4sX*)?zUomdAst9MAQglXD8Nhp9|wZ#M&Q9YXWeBl
z-_C7Ekq3!Wwjl@t7oDr0$zU)@q=Nhl-fT8~$8mb+^SN_%z;PnXEk~o#PU?W6;R_B1
z1z?O8DU@qoHs5G8y09QF1rvHYo%R^M01_UL$HjO&4$VE7_h}726O6l)$t1c9hWS5)
z0#2YWcVxX@`_Oo<nzv2gHww^xrfC_J!ael0Dl#+IbFiAm{#`0cv)S~~QPZgv%#_k#
z#V{$V3a0tY5)57X{st_Xr`Qxrefiejvw>5A*0IzSoJoUrI2^3OODCbRC-vo(Kdn~l
z7OcJsnf&loU3f<<vB_Nl=ofpW&Ri-Al;B>*Cp6b`Fp~U3F3<N(58RdQcH4szzFZ#2
z!d$<4d8^gRLvHR>iyaS`wLq)gRH126LhG6@&sv1CdZAOF@|RN2v`8;zTw=z>2Dg??
zYK8QfLE~QGf=m)zyhIkzb&Sp41}`o2bPo==Yyie)CDT`%!-vCRyArsH6ydP)sp`K>
dtqbJQ@(Wyn>H5O5B&h%Z002ovPDHLkV1l+t>V5zK

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
new file mode 100644
index 0000000..ff2ea14
--- /dev/null
+++ b/Better-me-iOS/Assets.xcassets/so-trash.imageset/Contents.json
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "so-trash.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png b/Better-me-iOS/Assets.xcassets/so-trash.imageset/so-trash.png
new file mode 100644
index 0000000000000000000000000000000000000000..9cb7bb47522d6f1959f7f4caaa9aef4789ff16e9
GIT binary patch
literal 428
zcmV;d0aN~oP)<h;3K|Lk000e1NJLTq000vJ000&U1^@s6BAusy00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0YOPbK~#7FtyJw%
zgfI|YzJ8ld)DEzN>p&R>>d+4S&G4ZWNC~k5wE|ND{^!HDBQhj+x#KwAOlBY1?8|18
zg=j-KHb+%e0!EngQ4}d#jB9fY!|>Sm{kJ)aqNwOpW?1x~IUMI6g5h3(<4DZEPT9C_
zgKX<bEYI^D7QNAWL~$Iy_{==dlQ_Z?tpu`@v^BKbEX(p4^|+#iKt>Annoi^!{%eeo
z76Kbfm`ThvoDE$7O$;~sGt#>2x?5NlS0h*a&77adxVf^5&G40`=_dyxP%&rA-^?NM
zZfw3UX6|$fW?9V4wyW6+F?CGrEO1|1#rP4jMPUUkK-;#OnAQPVmffIFKj`nc5@R>I
zYJ-Ou0{wiKB#Hcw*E%2wf(8qiidit(xbORF9)IWp&bb8pF&Vbs^&ufN`9)9ZD1HGi
WBaxU68bs;<0000<MNUMnLSTZb5wg|*

literal 0
HcmV?d00001

diff --git a/Better-me-iOS/Base.lproj/Main.storyboard b/Better-me-iOS/Base.lproj/Main.storyboard
index 320236f..b1ed38b 100644
--- a/Better-me-iOS/Base.lproj/Main.storyboard
+++ b/Better-me-iOS/Base.lproj/Main.storyboard
@@ -474,7 +474,7 @@
                                 </subviews>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0ia-fn-8Be">
-                                <rect key="frame" x="-11" y="59" width="394" height="44"/>
+                                <rect key="frame" x="-14" y="59" width="391" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                         </subviews>
@@ -840,28 +840,43 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
-                        <segue destination="GrP-Sx-epD" kind="relationship" relationship="rootViewController" id="c8H-Vj-xKL"/>
+                        <segue destination="GrP-Sx-epD" kind="relationship" relationship="rootViewController" destinationCreationSelector="addSwiftUIView:" id="c8H-Vj-xKL"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="jTY-O2-O9R" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-918" y="354"/>
         </scene>
-        <!--View Controller-->
+        <!--Social View Controller-->
         <scene sceneID="HkT-Mj-ueX">
             <objects>
-                <viewController id="GrP-Sx-epD" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="FdV-kQ-Xf4">
+                <viewController id="GrP-Sx-epD" customClass="SocialViewController" customModule="Better_me_iOS" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="FdV-kQ-Xf4" customClass="SocialViewControllerSocialViewController">
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oBR-7s-wo2">
+                                <rect key="frame" x="0.0" y="103" width="393" height="666"/>
+                                <connections>
+                                    <segue destination="pYz-Fy-JDu" kind="embed" destinationCreationSelector="addSwiftUIView:" id="aD7-lc-wt8"/>
+                                </connections>
+                            </containerView>
+                        </subviews>
                         <viewLayoutGuide key="safeArea" id="o3c-Ra-Hbi"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="top" secondItem="o3c-Ra-Hbi" secondAttribute="top" id="2Wn-Aw-mdE"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="bottom" secondItem="o3c-Ra-Hbi" secondAttribute="bottom" id="7qY-8R-TBR"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="top" secondItem="o3c-Ra-Hbi" secondAttribute="top" id="IeS-ET-YHf"/>
+                            <constraint firstItem="oBR-7s-wo2" firstAttribute="leading" secondItem="o3c-Ra-Hbi" secondAttribute="leading" id="LOj-IU-BTt"/>
+                            <constraint firstItem="o3c-Ra-Hbi" firstAttribute="trailing" secondItem="oBR-7s-wo2" secondAttribute="trailing" id="xYZ-Yp-nFh"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="m3Q-6u-C0D"/>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="7uG-hm-9zt" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="354"/>
+            <point key="canvasLocation" x="52.671755725190835" y="353.52112676056339"/>
         </scene>
         <!--Navigation Controller-->
         <scene sceneID="K5I-fQ-Ex3">
@@ -1052,7 +1067,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="AoP-gY-6si" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="53" y="1056"/>
+            <point key="canvasLocation" x="52.671755725190835" y="1054.9295774647887"/>
         </scene>
         <!--좋은 습관 만들기-->
         <scene sceneID="btS-4h-SSP">
@@ -1147,7 +1162,7 @@
                                 </constraints>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CoN-8S-PM6">
-                                <rect key="frame" x="-11" y="59" width="395" height="44"/>
+                                <rect key="frame" x="-16" y="59" width="394" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f3A-Aq-spj">
@@ -1304,7 +1319,7 @@
                                 </subviews>
                             </stackView>
                             <navigationBar contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ORX-v8-4xn">
-                                <rect key="frame" x="-10" y="59" width="394" height="44"/>
+                                <rect key="frame" x="-13" y="59" width="391" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                             </navigationBar>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mm5-G8-rgC">
@@ -1688,6 +1703,14 @@
             </objects>
             <point key="canvasLocation" x="1108" y="2572"/>
         </scene>
+        <!--Content View-->
+        <scene sceneID="h5b-MK-qEN">
+            <objects>
+                <hostingController id="pYz-Fy-JDu" customClass="ContentView" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="N8B-4N-TOR" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="839" y="535"/>
+        </scene>
     </scenes>
     <resources>
         <image name="AwardButton" width="21.666666030883789" height="28.333333969116211"/>
diff --git a/Better-me-iOS/HomeViewController.swift b/Better-me-iOS/HomeViewController.swift
index 16816e9..d6773c0 100644
--- a/Better-me-iOS/HomeViewController.swift
+++ b/Better-me-iOS/HomeViewController.swift
@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import SwiftUI
 
 class HomeViewController: UIViewController {
 
diff --git a/Better-me-iOS/Social/Data/Agree.swift b/Better-me-iOS/Social/Data/Agree.swift
new file mode 100644
index 0000000..c9dfe50
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Agree.swift
@@ -0,0 +1,18 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct AgreeResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/AgreeModel.swift b/Better-me-iOS/Social/Data/AgreeModel.swift
new file mode 100644
index 0000000..cfabbcd
--- /dev/null
+++ b/Better-me-iOS/Social/Data/AgreeModel.swift
@@ -0,0 +1,56 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class AgreeModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+//    @Published var SearchNames = [SearchName]()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/accept/1/2"
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+//    var param = ["nickName": "김"]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+//        fetchRandomUsers()
+    }
+    
+//    func fetchRandomUsers(){
+//        print(#fileID, #function, #line, "")
+//        AF.request(baseUrl, method: .patch).publishDecodable(type: AgreeResponse.self)
+//            .compactMap{ $0.value }
+//            .map{ $0.result }
+//            .sink(receiveCompletion: { completion in
+//                print("데이터스트림 완료")
+//            }, receiveValue: { receivedValue in
+//                print("받은 값 : \(receivedValue.count)")
+//                self.SearchNames = receivedValue
+//            }).store(in: &subscripttion)
+//    }
+    func patch(){
+//        func fetchRandomUsers(){
+            print(#fileID, #function, #line, "")
+            AF.request(baseUrl, method: .patch, headers: token).responseString { (response) in
+                switch response.result {
+                case .success:
+                    print("POST 성공")
+                case .failure(let error):
+                    print("🚫 Alamofire Request Error\nCode:\(error._code), Message: \(error.errorDescription!)")
+                }
+            }
+//        }
+    }
+}
+
+
diff --git a/Better-me-iOS/Social/Data/FriendDelete.swift b/Better-me-iOS/Social/Data/FriendDelete.swift
new file mode 100644
index 0000000..7a71c64
--- /dev/null
+++ b/Better-me-iOS/Social/Data/FriendDelete.swift
@@ -0,0 +1,18 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct FriendDeleteResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/FriendDeleteModel.swift b/Better-me-iOS/Social/Data/FriendDeleteModel.swift
new file mode 100644
index 0000000..d7b9876
--- /dev/null
+++ b/Better-me-iOS/Social/Data/FriendDeleteModel.swift
@@ -0,0 +1,52 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class FriendDeleteModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/accept/1/2"
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    var param = ["followee": [20, 33]]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+//        fetchRandomUsers()
+    }
+    
+//    func fetchRandomUsers(){
+//        print(#fileID, #function, #line, "")
+//        AF.request(baseUrl, method: .patch).publishDecodable(type: AgreeResponse.self)
+//            .compactMap{ $0.value }
+//            .map{ $0.result }
+//            .sink(receiveCompletion: { completion in
+//                print("데이터스트림 완료")
+//            }, receiveValue: { receivedValue in
+//                print("받은 값 : \(receivedValue.count)")
+//                self.SearchNames = receivedValue
+//            }).store(in: &subscripttion)
+//    }
+    func Delete(completionHandler: @escaping (Result<[FriendDeleteResponse], Error>) -> Void){
+//        func fetchRandomUsers(){
+            print(#fileID, #function, #line, "")
+            AF.request(baseUrl, method: .delete, headers: token).response { response in
+                switch response.result {
+                case .success:
+                    completionHandler(.success([FriendDeleteResponse(isSuccess: true, code: 1000, message: "성공")]))
+                case .failure(let error):
+                    completionHandler(.failure(error))
+                }
+            }
+//        }
+    }
+}
diff --git a/Better-me-iOS/Social/Data/HabitAgree.swift b/Better-me-iOS/Social/Data/HabitAgree.swift
new file mode 100644
index 0000000..d81c576
--- /dev/null
+++ b/Better-me-iOS/Social/Data/HabitAgree.swift
@@ -0,0 +1,18 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct HabitAgreeResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/HabitAgreeModel.swift b/Better-me-iOS/Social/Data/HabitAgreeModel.swift
new file mode 100644
index 0000000..94c4a79
--- /dev/null
+++ b/Better-me-iOS/Social/Data/HabitAgreeModel.swift
@@ -0,0 +1,37 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class HabitAgreeModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/accept/:userIdx/:habitIdx"
+    
+    var param = ["followee": [20, 33]]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+//        fetchRandomUsers()
+    }
+    
+
+    func Patch(completionHandler: @escaping (Result<[HabitAgreeResponse], Error>) -> Void){
+            print(#fileID, #function, #line, "")
+            AF.request(baseUrl, method: .patch).response { response in
+                switch response.result {
+                case .success:
+                    completionHandler(.success([HabitAgreeResponse(isSuccess: true, code: 201, message: "습관 초대 수락 성공")]))
+                case .failure(let error):
+                    completionHandler(.failure(error))
+                }
+            }
+    }
+}
diff --git a/Better-me-iOS/Social/Data/HabitDisagree.swift b/Better-me-iOS/Social/Data/HabitDisagree.swift
new file mode 100644
index 0000000..d333f2f
--- /dev/null
+++ b/Better-me-iOS/Social/Data/HabitDisagree.swift
@@ -0,0 +1,18 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct HabitDisagreeResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/HabitDisagreeModel.swift b/Better-me-iOS/Social/Data/HabitDisagreeModel.swift
new file mode 100644
index 0000000..e80c063
--- /dev/null
+++ b/Better-me-iOS/Social/Data/HabitDisagreeModel.swift
@@ -0,0 +1,36 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class HabitDisagreeModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/accpet/:userIdx/:habitIdx"
+    
+    var param = ["followee": [20, 33]]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+//        fetchRandomUsers()
+    }
+    
+    func Patch(completionHandler: @escaping (Result<[HabitDisagreeResponse], Error>) -> Void){
+            print(#fileID, #function, #line, "")
+            AF.request(baseUrl, method: .patch).response { response in
+                switch response.result {
+                case .success:
+                    completionHandler(.success([HabitDisagreeResponse(isSuccess: true, code: 201, message: "습관 초대 거절 성공")]))
+                case .failure(let error):
+                    completionHandler(.failure(error))
+                }
+            }
+    }
+}
diff --git a/Better-me-iOS/Social/Data/InviteHabit.swift b/Better-me-iOS/Social/Data/InviteHabit.swift
new file mode 100644
index 0000000..83304fd
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabit.swift
@@ -0,0 +1,24 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+struct InviteHabit: Codable, Hashable{
+    var senderIdx: Int
+    var receiverIdx: Int
+    var habitIdx: Int
+    var habitName: String
+    var contents: String
+    var emoge: String
+}
+
+struct InviteHabitResponse: Codable{
+    var result: [InviteHabit]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
diff --git a/Better-me-iOS/Social/Data/InviteHabitModel.swift b/Better-me-iOS/Social/Data/InviteHabitModel.swift
new file mode 100644
index 0000000..5807312
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabitModel.swift
@@ -0,0 +1,38 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class InviteHabitModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var InviteHabits = [InviteHabit]()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/2"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: InviteHabitResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.InviteHabits = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/InviteHabitPost.swift b/Better-me-iOS/Social/Data/InviteHabitPost.swift
new file mode 100644
index 0000000..cd457c5
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabitPost.swift
@@ -0,0 +1,16 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct InviteHabitPostResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
diff --git a/Better-me-iOS/Social/Data/InviteHabitPostModel.swift b/Better-me-iOS/Social/Data/InviteHabitPostModel.swift
new file mode 100644
index 0000000..7003e64
--- /dev/null
+++ b/Better-me-iOS/Social/Data/InviteHabitPostModel.swift
@@ -0,0 +1,48 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class InviteHabitPostModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/1"
+    
+    var param = ["habitIdx": 1, "receiverIdx": 2]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+//        fetchRandomUsers()
+    }
+    
+//    func fetchRandomUsers(){
+//        print(#fileID, #function, #line, "")
+//        AF.request(baseUrl, method: .patch).publishDecodable(type: AgreeResponse.self)
+//            .compactMap{ $0.value }
+//            .map{ $0.result }
+//            .sink(receiveCompletion: { completion in
+//                print("데이터스트림 완료")
+//            }, receiveValue: { receivedValue in
+//                print("받은 값 : \(receivedValue.count)")
+//                self.SearchNames = receivedValue
+//            }).store(in: &subscripttion)
+//    }
+    func Delete(completionHandler: @escaping (Result<[InviteHabitPostResponse], Error>) -> Void){
+            print(#fileID, #function, #line, "")
+            AF.request(baseUrl, method: .post).response { response in
+                switch response.result {
+                case .success:
+                    completionHandler(.success([InviteHabitPostResponse(isSuccess: true, code: 201, message: "습관 초대 성공")]))
+                case .failure(let error):
+                    completionHandler(.failure(error))
+                }
+            }
+    }
+}
diff --git a/Better-me-iOS/Social/Data/NewPerson.swift b/Better-me-iOS/Social/Data/NewPerson.swift
new file mode 100644
index 0000000..00e3cdf
--- /dev/null
+++ b/Better-me-iOS/Social/Data/NewPerson.swift
@@ -0,0 +1,36 @@
+//
+//  RandomUser+ResponseData.swift
+//  Server
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+
+struct Priend: Codable, Hashable{
+    
+    
+//    var id = UUID()
+    var followee: Int
+    var nickName: String
+//    var photo: String
+    var promise: String
+    var acceptedAt: String
+    var stars: Int
+    
+}
+
+
+
+
+
+struct FriendResponse: Codable{
+    
+    var result: [Priend]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+
+}
+
+
diff --git a/Better-me-iOS/Social/Data/NewPersonModel.swift b/Better-me-iOS/Social/Data/NewPersonModel.swift
new file mode 100644
index 0000000..3cdaad7
--- /dev/null
+++ b/Better-me-iOS/Social/Data/NewPersonModel.swift
@@ -0,0 +1,48 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class NewPersonModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var Friends = [Priend]()
+    
+    @Published var nickNameArray = [String]()
+    
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/1"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        self.Friends = Friends
+        fetchRandomUsers()
+        appendNickName()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl, headers: token).publishDecodable(type: FriendResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.Friends = receivedValue
+            }).store(in: &subscripttion)
+    }
+    func appendNickName(){
+        nickNameArray = Friends.map{ $0.nickName }
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/Person.swift b/Better-me-iOS/Social/Data/Person.swift
new file mode 100644
index 0000000..4b49dcb
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Person.swift
@@ -0,0 +1,18 @@
+//
+//  Person.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/12.
+//
+
+import Foundation
+
+struct Person: Identifiable{
+    
+    var id = UUID()
+    var name = ""
+    var online = false
+    var like = 0
+    var habit = "습관 없음"
+    
+}
diff --git a/Better-me-iOS/Social/Data/PersonModel.swift b/Better-me-iOS/Social/Data/PersonModel.swift
new file mode 100644
index 0000000..ead1501
--- /dev/null
+++ b/Better-me-iOS/Social/Data/PersonModel.swift
@@ -0,0 +1,35 @@
+//
+//  People.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/16.
+//
+
+import Foundation
+
+
+
+
+
+class PersonModel: ObservableObject {
+    @Published var people = [Person]()
+    
+    init(){
+        people.append(Person(name: "신디", online: false, like: 17, habit: "일어나자마자 이불개기"))
+        people.append(Person(name: "리미", online: true, like: 23))
+        people.append(Person(name: "매버릭", online: true, like: 7, habit: "일어나자마자 양치하기"))
+        people.append(Person(name: "범", online: false, like: 2))
+        people.append(Person(name: "폴", online: false, like: 9, habit: "일어나자마자 아침먹기"))
+        people.append(Person(name: "벨라", online: true, like: 0))
+        people.append(Person(name: "피딕", online: false, like: 8, habit: "일어나자마자 과제하기"))
+        people.append(Person(name: "주니", online: false, like: 10, habit: "일어나자마자 청소하기"))
+        people.append(Person(name: "포디", online: true, like: 11))
+        people.append(Person(name: "혀니", online: false, like: 13))
+    }
+    
+    
+
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/RequestStatus.swift b/Better-me-iOS/Social/Data/RequestStatus.swift
new file mode 100644
index 0000000..ba2d81a
--- /dev/null
+++ b/Better-me-iOS/Social/Data/RequestStatus.swift
@@ -0,0 +1,34 @@
+//
+//  RandomUser+ResponseData.swift
+//  Server
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+
+struct RequestStatus: Codable, Hashable{
+    
+    
+//    var id = UUID()
+    var habitIdx: Int
+    var receiverIdx: Int
+    var status: String
+    
+}
+
+
+
+
+
+struct RequestStatusResponse: Codable{
+    
+    var result: [RequestStatus]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/RequestStatusModel.swift b/Better-me-iOS/Social/Data/RequestStatusModel.swift
new file mode 100644
index 0000000..e413974
--- /dev/null
+++ b/Better-me-iOS/Social/Data/RequestStatusModel.swift
@@ -0,0 +1,41 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class RequestStatusModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var RequestStatuses = [RequestStatus]()
+    
+//    @Published var nickNameArray = [String]()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/invite/response/:userIdx"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        self.RequestStatuses = RequestStatuses
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl).publishDecodable(type: RequestStatusResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.RequestStatuses = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/Request_Friend.swift b/Better-me-iOS/Social/Data/Request_Friend.swift
new file mode 100644
index 0000000..16000e9
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_Friend.swift
@@ -0,0 +1,24 @@
+//
+//  Request_Friend.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/04.
+//
+
+import Foundation
+
+struct RequestFriend: Codable, Hashable{
+    var userIdx: Int
+    var nickName: String
+//    var photo: String
+}
+
+struct RequestFriendResponse: Codable{
+    var result: [RequestFriend]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/Request_FriendModel.swift b/Better-me-iOS/Social/Data/Request_FriendModel.swift
new file mode 100644
index 0000000..458d802
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_FriendModel.swift
@@ -0,0 +1,42 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class Request_FriendModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var RequestFriends = [RequestFriend]()
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    var param = [ "followee": [20, 33] ]
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/request/2"
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl, headers: token).publishDecodable(type: RequestFriendResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.RequestFriends = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/Request_Friend_Post.swift b/Better-me-iOS/Social/Data/Request_Friend_Post.swift
new file mode 100644
index 0000000..206cf37
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_Friend_Post.swift
@@ -0,0 +1,18 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+
+struct Request_Friend_PostResponse: Codable{
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/Request_Friend_PostModel.swift b/Better-me-iOS/Social/Data/Request_Friend_PostModel.swift
new file mode 100644
index 0000000..60b8b73
--- /dev/null
+++ b/Better-me-iOS/Social/Data/Request_Friend_PostModel.swift
@@ -0,0 +1,37 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class Request_Friend_PostModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/request/:userIdx/:followee"
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        //        fetchRandomUsers()
+    }
+    
+    
+    func Post(completionHandler: @escaping (Result<[Request_Friend_PostResponse], Error>) -> Void) {
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl, method: .post, headers: token).response { response in
+            switch response.result {
+            case .success:
+                completionHandler(.success([Request_Friend_PostResponse(isSuccess: true, code: 1000, message: "성공")]))
+            case .failure(let error):
+                completionHandler(.failure(error))
+            }
+        }
+    }
+}
diff --git a/Better-me-iOS/Social/Data/SearchEmail.swift b/Better-me-iOS/Social/Data/SearchEmail.swift
new file mode 100644
index 0000000..0e455be
--- /dev/null
+++ b/Better-me-iOS/Social/Data/SearchEmail.swift
@@ -0,0 +1,26 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+struct SearchEmail: Codable, Hashable{
+    var userIdx: Int
+    var nickName: String
+//    var photo: String
+    var stars: Int
+    var acceptStatus: Int
+}
+
+struct SearchEmailResponse: Codable{
+    var result: [SearchEmail]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/SearchEmailModel.swift b/Better-me-iOS/Social/Data/SearchEmailModel.swift
new file mode 100644
index 0000000..2a6a6e0
--- /dev/null
+++ b/Better-me-iOS/Social/Data/SearchEmailModel.swift
@@ -0,0 +1,42 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class SearchEmailModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var SearchEmails = [SearchEmail]()
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/searchE/1"
+    
+    var param = ["email": "a"]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl, method: .get, parameters: param, headers: token).publishDecodable(type: SearchEmailResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.SearchEmails = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/Data/SearchName.swift b/Better-me-iOS/Social/Data/SearchName.swift
new file mode 100644
index 0000000..e40ff47
--- /dev/null
+++ b/Better-me-iOS/Social/Data/SearchName.swift
@@ -0,0 +1,25 @@
+//
+//  InviteHabit.swift
+//  PlusAPI
+//
+//  Created by 황인성 on 2023/02/05.
+//
+
+import Foundation
+
+struct SearchName: Codable, Hashable{
+    var followee: Int
+    var nickName: String
+//    var photo: String
+    var stars: Int
+}
+
+struct SearchNameResponse: Codable{
+    var result: [SearchName]
+    var isSuccess: Bool
+    var code: Int
+    var message: String
+}
+
+
+
diff --git a/Better-me-iOS/Social/Data/SearchNameModel.swift b/Better-me-iOS/Social/Data/SearchNameModel.swift
new file mode 100644
index 0000000..41053b8
--- /dev/null
+++ b/Better-me-iOS/Social/Data/SearchNameModel.swift
@@ -0,0 +1,42 @@
+//
+//  RandomUserViewModel.swift
+//  RandomUserApi
+//
+//  Created by 황인성 on 2023/02/03.
+//
+
+import Foundation
+import Combine
+import Alamofire
+
+class SearchNameModel: ObservableObject{
+    
+    var subscripttion = Set<AnyCancellable>()
+    
+    @Published var SearchNames = [SearchName]()
+    
+    var token: HTTPHeaders = ["x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWR4IjoxLCJpYXQiOjE2NzU5MTgyNjksImV4cCI6MTY3NjAwNDY2OSwic3ViIjoidXNlckluZm8ifQ.PyrzZVmeAAJ2KggsvNbYh1Qp9tC-0Swd_MULrN9Gmbs"]
+    
+    var baseUrl = "http://54.180.13.219:3000/app/follow/searchN/1"
+    
+    var param: Parameters = ["nickName": "포"]
+    
+    init(){
+        print(#fileID, #function, #line, "")
+        fetchRandomUsers()
+    }
+    
+    func fetchRandomUsers(){
+        print(#fileID, #function, #line, "")
+        AF.request(baseUrl, method: .get, parameters: param, headers: token).publishDecodable(type: SearchNameResponse.self)
+            .compactMap{ $0.value }
+            .map{ $0.result }
+            .sink(receiveCompletion: { completion in
+                print("데이터스트림 완료")
+            }, receiveValue: { receivedValue in
+                print("받은 값 : \(receivedValue.count)")
+                self.SearchNames = receivedValue
+            }).store(in: &subscripttion)
+    }
+    
+}
diff --git a/Better-me-iOS/Social/SocialViewController.swift b/Better-me-iOS/Social/SocialViewController.swift
new file mode 100644
index 0000000..b7d14e0
--- /dev/null
+++ b/Better-me-iOS/Social/SocialViewController.swift
@@ -0,0 +1,40 @@
+//
+//  SocialViewController.swift
+//  Better-me-iOS
+//
+//  Created by 황인성 on 2023/02/01.
+//
+
+import UIKit
+import SwiftUI
+
+class SocialViewController: UIViewController {
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        navigationController?.setNavigationBarHidden(true, animated: animated)
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+    
+    
+    @IBSegueAction func addSwiftUIView(_ coder: NSCoder) -> UIViewController? {
+        return UIHostingController(coder: coder, rootView: ContentView())
+    }
+    
+
+    /*
+    // MARK: - Navigation
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        // Get the new view controller using segue.destination.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}
diff --git a/Better-me-iOS/Social/SwiftUIView.swift b/Better-me-iOS/Social/SwiftUIView.swift
new file mode 100644
index 0000000..c64f3d9
--- /dev/null
+++ b/Better-me-iOS/Social/SwiftUIView.swift
@@ -0,0 +1,1132 @@
+//
+//  ContentView.swift
+//  BetterMe-SwiftUI
+//
+//  Created by 황인성 on 2023/01/11.
+//
+
+import SwiftUI
+import PopupView
+
+struct NewSearchBar: View {
+    
+    @Binding var text:String
+    @State var searchText = ""
+    
+    var body: some View {
+        HStack {
+            HStack {
+                TextField("친구 찾기", text: $text)
+                    .underlineTextField()
+                    .foregroundColor(.primary)
+                
+                Button(action: {
+                    searchText = text
+                    print(searchText)
+                }, label: {
+                    Image(systemName: "magnifyingglass")
+                })
+                if !text.isEmpty {
+                    Button(action: {
+                        self.text = ""
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                    }
+                } else {
+                    EmptyView()
+                }
+            }
+            .padding(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
+            .foregroundColor(.secondary)
+        }
+        .padding(.horizontal)
+    }
+}
+
+struct FriendSearchView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    @ObservedObject var data = SearchNameModel()
+    
+    @State var array = ["신디", "리미", "매버릭", "범", "벨라", "폴", "피딕", "주니", "포디", "혀니", "asd", "asd","asd","Asd"]
+    
+    @State private var searchText = ""
+    
+    var body: some View {
+        
+        VStack {
+            NewSearchBar(text: $searchText)
+                .padding(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 0))
+            
+            List(data.SearchNames, id: \.self) { searchText in
+                //                    ForEach(array.filter{$0.hasPrefix(searchText) || searchText == ""}, id:\.self) {searchText in
+                
+                ZStack(alignment: .leading) {
+                    Rectangle().fill(Color(red: 0.5, green: 0.5, blue: 0.5, opacity: 0.30)).cornerRadius(8).frame(height: 55)
+                    
+                    HStack {
+                        Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                            .foregroundColor(Color.random()).padding(.leading)
+                        Text(searchText.nickName)
+                    }.listRowSeparator(.hidden)
+                }
+            }.listRowSeparator(.hidden)
+        } //리스트의 스타일 수정
+        .listStyle(PlainListStyle())
+        //화면 터치시 키보드 숨김
+        .onTapGesture {
+            hideKeyboard()
+        }
+        .navigationBarItems(leading:
+                                Button(action: {
+            self.presentationMode.wrappedValue.dismiss()
+        }, label: {
+            Image(systemName: "x.circle")
+        })
+        )
+    }
+}
+//}
+
+
+//struct homeView: View {
+//    var body: some View {
+//
+////        NavigationView{
+//            Button(action: {
+//                print("Floating Button Click")
+//            }, label: {
+//                NavigationLink(destination: SearchView()) {
+//                    Image("Group 65").frame(width: 51, height: 51, alignment: .bottomTrailing)
+//                }
+//            })
+////        }
+//
+//    }
+//}
+
+extension View {
+    func underlineTextField() -> some View {
+        self
+            .padding(.vertical, 10)
+            .overlay(Rectangle().frame(height: 2).padding(.top, 35))
+            .foregroundColor(.black)
+            .padding(10)
+    }
+}
+
+extension Color {
+    static func random() -> Color {
+        return Color(red: Double.random(in: 0...1), green: Double.random(in: 0...1), blue: Double.random(in: 0...1))
+    }
+}
+
+struct CheckboxFieldView: View {
+    
+    @State var checkState: Bool = false
+    
+    var body: some View {
+        
+        Button(action:
+                {
+            self.checkState = !self.checkState
+            print("State : \(self.checkState)")
+        }) {
+            HStack(alignment: .top, spacing: 10) {
+                
+                //2. Will update according to state
+                Rectangle()
+                    .fill(self.checkState ? Color.green : Color.red)
+                    .frame(width:20, height:20, alignment: .center)
+                    .cornerRadius(5)
+                
+            }
+        }
+        .foregroundColor(Color.white)
+        
+    }
+    
+}
+
+
+struct SecondView: View{
+    
+    @ObservedObject var data = Request_FriendModel()
+    @ObservedObject var agree = AgreeModel()
+    
+    @State var show1 = false
+    @State var show2 = false
+    @State var name = "default"
+    
+    
+    
+    
+    var body: some View{
+        
+        ZStack {
+            List{
+                ForEach(data.RequestFriends, id: \.self){ request in
+                    HStack{
+                        Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                            .foregroundColor(Color.random())
+                        Text(request.nickName)
+                        Spacer()
+                        Button(action: {
+                            print("거절")
+                            self.name = request.nickName
+                            self.show2 = true
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .stroke(Color.red, lineWidth: 1)
+                                    .frame(width: 58, height: 31)
+                                Text("거절")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.red)
+                                    .lineSpacing(18.20)
+                            }
+                            
+                        })
+                        Button(action: {
+                            print("수락")
+                            self.name = request.nickName
+                            self.show1 = true
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .frame(width: 58, height: 31)
+                                    .foregroundColor(.red)
+                                Text("수락")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.white)
+                                    .lineSpacing(18.20)
+                            }
+                        })
+                    }
+                }.buttonStyle(BorderlessButtonStyle())
+            }.frame( maxWidth: .infinity, maxHeight: .infinity)
+                .edgesIgnoringSafeArea(.all)
+                .listStyle(PlainListStyle())
+        }
+        .popup(isPresented: $show1, view: {
+            self.AgreePopUp(name2: name)
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+        .popup(isPresented: $show2, view: {
+            self.DisagreePopUp(name2: name)
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+    }
+    func AgreePopUp(name2: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("공유해요!")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 76, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name2) 님의")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("친구요청을 수락하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                        self.show1 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show1 = false
+                        self.agree.patch()
+                        //                        data.patchFriend()
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+    func DisagreePopUp(name2: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("아쉽네요")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 76, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name2) 님의")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("친구요청을 거절하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                        self.show2 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show2 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+}
+
+
+struct ThirdView: View{
+    
+    @State var show1 = false
+    @State var show2 = false
+    @State var name = "default"
+    @State var habit = "default"
+    
+    @ObservedObject var data = InviteHabitModel()
+    
+    var body: some View{
+        ZStack {
+            List(data.InviteHabits, id: \.self){ invite in
+                //                ForEach(model.people){ p in
+                HStack{
+                    VStack(alignment: .leading){
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 19.50)
+                                .fill(Color(red: 1, green: 0.92, blue: 0.92))
+                                .frame(width: 74, height: 27)
+                            HStack {
+                                Image(systemName: "person.circle.fill").resizable().frame(width: 19, height: 19)
+                                    .foregroundColor(Color.random())
+                                Text(String(invite.senderIdx)).fontWeight(.semibold)
+                                    .font(.caption)
+                                    .lineSpacing(16.80)
+                            }
+                        }
+                        HStack(alignment: .top) {
+                            Text("😊")
+                                .fontWeight(.semibold)
+                                .font(.subheadline)
+                                .lineSpacing(21)
+                            VStack {
+                                Text(invite.habitName)
+                                Text(invite.contents)
+                            }
+                        }
+                    }
+                    Spacer()
+                    VStack{
+                        Button(action: {
+                            self.name = String(invite.senderIdx)
+                            self.habit = invite.habitName
+                            print("수락")
+                            self.show1 = true
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .frame(width: 58, height: 31)
+                                    .foregroundColor(.red)
+                                Text("수락")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.white)
+                                    .lineSpacing(18.20)
+                            }
+                        })
+                        Button(action: {
+                            self.name = String(invite.senderIdx)
+                            self.habit = invite.contents
+                            print("거절")
+                            self.show2 = true
+                        }, label: {
+                            ZStack {
+                                RoundedRectangle(cornerRadius: 15.5)
+                                    .stroke(Color.red, lineWidth: 1)
+                                    .frame(width: 58, height: 31)
+                                Text("거절")
+                                    .font(.footnote)
+                                    .fontWeight(.semibold)
+                                    .foregroundColor(Color.red)
+                                    .lineSpacing(18.20)
+                            }
+                        })
+                    }.buttonStyle(BorderlessButtonStyle())
+                    //                    }
+                }
+            }.listStyle(PlainListStyle())
+        }
+        .popup(isPresented: $show1, view: {
+            self.AgreePopUp(name2: name, habit2: habit)
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+        .popup(isPresented: $show2, view: {
+            self.DisagreePopUp(name2: name, habit2: habit)
+        }, customize: {
+            $0
+                .type (.default)
+                .position(.top)
+                .dragToDismiss(true)
+                .closeOnTapOutside(true)
+                .backgroundColor(.black.opacity(0.5))
+        })
+        
+    }
+    
+    func AgreePopUp(name2: String, habit2: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("화이팅")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 52, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name2) 님께서 보내신")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("[ \(habit2) ]")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("습관초대를 수락하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                        self.show1 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show1 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+    func DisagreePopUp(name2: String, habit2: String) -> some View{
+        ZStack {
+            RoundedRectangle(cornerRadius: 22)
+                .fill(Color.white)
+                .frame(width: 252, height: 248)
+            VStack{
+                Text("화이팅")
+                    .fontWeight(.bold)
+                    .font(.title3)
+                    .foregroundColor(Color.red)
+                    .frame(width: 52, height: 28, alignment: .top)
+                
+                Spacer().frame(height: 35)
+                
+                Text("\(name2) 님께서 보내신")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("[ \(habit2) ]")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 21)
+                
+                Text("습관초대를 거절하시겠습니까?")
+                    .fontWeight(.bold)
+                    .font(.subheadline)
+                    .lineSpacing(21)
+                
+                Spacer().frame(height: 30)
+                
+                HStack{
+                    Button(action: {
+                        print("취소")
+                        self.show2 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                                .stroke(Color.red, lineWidth: 1)
+                                .frame(width: 58, height: 31)
+                            Text("취소")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.red)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                    Spacer().frame(width: 30)
+                    Button(action: {
+                        print("좋아요!")
+                        self.show2 = false
+                    }, label: {
+                        ZStack {
+                            RoundedRectangle(cornerRadius: 15.5)
+                            
+                                .frame(width: 58, height: 31)
+                                .foregroundColor(.red)
+                            Text("좋아요!")
+                                .font(.footnote)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color.white)
+                                .lineSpacing(18.20)
+                        }
+                    })
+                }
+            }
+        }
+    }
+}
+
+struct CustomTopTabBar: View {
+    @Binding var tabIndex: Int
+    @Namespace var animation
+    var body: some View {
+        HStack {
+            
+            TabBarButton(text: "친구", isSelected: .constant(tabIndex == 0))
+                .onTapGesture { onButtonTapped(index: 0) }
+            
+            Spacer()
+            TabBarButton(text: "친구 요청", isSelected: .constant(tabIndex == 1))
+                .onTapGesture { onButtonTapped(index: 1) }
+            
+            Spacer()
+            TabBarButton(text: "습관 초대", isSelected: .constant(tabIndex == 2))
+                .onTapGesture { onButtonTapped(index: 2) }
+            
+        }
+        .border(width: 1, edges: [.bottom], color: .clear)
+    }
+    
+    private func onButtonTapped(index: Int) {
+        withAnimation { tabIndex = index }
+    }
+}
+
+struct TabBarButton: View {
+    let text: String
+    @Binding var isSelected: Bool
+    var body: some View {
+        Text(text)
+            .foregroundColor(isSelected ? .red : .gray)
+            .frame(width: 122)
+            .fontWeight(isSelected ? .heavy : .regular)
+            .font(.custom("Avenir", size: 16))
+            .padding(.bottom,10)
+            .border(width: isSelected ? 2 : 0, edges: [.bottom], color: .red)
+    }
+}
+
+struct EdgeBorder: Shape {
+    
+    var width: CGFloat
+    var edges: [Edge]
+    
+    func path(in rect: CGRect) -> Path {
+        var path = Path()
+        for edge in edges {
+            var x: CGFloat {
+                switch edge {
+                case .top, .bottom, .leading: return rect.minX
+                case .trailing: return rect.maxX - width
+                }
+            }
+            
+            var y: CGFloat {
+                switch edge {
+                case .top, .leading, .trailing: return rect.minY
+                case .bottom: return rect.maxY - width
+                }
+            }
+            
+            var w: CGFloat {
+                switch edge {
+                case .top, .bottom: return rect.width
+                case .leading, .trailing: return self.width
+                }
+            }
+            
+            var h: CGFloat {
+                switch edge {
+                case .top, .bottom: return self.width
+                case .leading, .trailing: return rect.height
+                }
+            }
+            path.addPath(Path(CGRect(x: x, y: y, width: w, height: h)))
+        }
+        return path
+    }
+}
+
+extension View {
+    func border(width: CGFloat, edges: [Edge], color: SwiftUI.Color) -> some View {
+        overlay(EdgeBorder(width: width, edges: edges).foregroundColor(color))
+    }
+}
+
+struct SortButtonView: View{
+    var body: some View{
+        VStack{
+            Button(action: {
+                
+            }, label: {
+                Text("상장 많은 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("상장 적은 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("가나다 순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("최근 추가순")
+            })
+            Spacer()
+            Button(action: {
+                
+            }, label: {
+                Text("오래된 순")
+            })
+        }
+    }
+}
+
+
+struct SortView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    var body: some View {
+        NavigationView{
+            VStack(alignment: .leading){
+                Rectangle().frame(height: 0)
+                SortButtonView()
+                Spacer()
+                Button(action: {
+                    self.presentationMode.wrappedValue.dismiss()
+                }, label: {
+                    Text("닫기").frame(width: 375, height: 80).foregroundColor(.black
+                    )
+                })
+            }.padding(.leading)
+                .navigationBarTitle("정렬", displayMode: .inline)
+        }
+    }
+}
+
+struct SearchBar: View {
+    
+    @Binding var text: String
+    
+    var body: some View {
+        HStack {
+            HStack {
+                TextField("친구 찾기", text: $text)
+                    .underlineTextField()
+                    .foregroundColor(.primary)
+                
+                Image(systemName: "magnifyingglass")
+                if !text.isEmpty {
+                    Button(action: {
+                        self.text = ""
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                    }
+                } else {
+                    EmptyView()
+                }
+            }
+            .padding(EdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8))
+            .foregroundColor(.secondary)
+        }
+        .padding(.horizontal)
+    }
+}
+
+#if canImport(UIKit)
+extension View {
+    func hideKeyboard() {
+        UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder), to: nil, from: nil, for: nil)
+    }
+}
+#endif
+
+struct SearchView: View {
+    
+    @Environment(\.presentationMode) private var presentationMode
+    
+    @ObservedObject var data = SearchNameModel()
+    
+    @State var array = ["Asd", "Fiddich"]
+    
+    
+    
+    @State private var searchText = ""
+    
+    var body: some View {
+        NavigationView {
+            VStack {
+                SearchBar(text: $searchText)
+                    .padding(EdgeInsets(top: 10, leading: 0, bottom: 10, trailing: 0))
+                
+                List(data.SearchNames, id:\.self) { searchText in
+                    //                    ForEach(array.filter{$0.hasPrefix(searchText) || searchText == ""}, id:\.self) {searchText in
+                    
+                    ZStack(alignment: .leading) {
+                        Rectangle().foregroundColor(.secondary).cornerRadius(8).frame(height: 55)
+                        
+                        HStack {
+                            Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                                .foregroundColor(Color.random()).padding(.leading)
+                            Text(searchText.nickName)
+                        }.listRowSeparator(.hidden)
+                    }
+                }
+            } //리스트의 스타일 수정
+            .listStyle(PlainListStyle())
+            //화면 터치시 키보드 숨김
+            .onTapGesture {
+                hideKeyboard()
+            }
+        }
+        .navigationBarItems(leading:
+                                Button(action: {
+            self.presentationMode.wrappedValue.dismiss()
+        }, label: {
+            Image(systemName: "x.circle")
+        })
+        )
+    }
+}
+//}
+
+
+
+
+struct FriendView: View {
+    
+    @ObservedObject var model = PersonModel()
+    @State var showModal = false
+    @State var showModalSearch = false
+    
+    var body: some View {
+        VStack{
+            
+            HStack{
+                Spacer().frame(width: 263)
+                Button(action: {
+                    self.showModalSearch = true
+                }, label: {
+                    Image("Magnifier")
+                }).sheet(isPresented: self.$showModalSearch){
+                    SearchView().presentationDetents([.fraction(0.75)])
+                }
+                //                Button(action: {
+                //                    self.showModal = true
+                //                }, label: {
+                //                    Image("Group 44")
+                //                }).sheet(isPresented: self.$showModal){
+                //                    SortView().presentationDetents([.medium])
+                //                }
+                Button(action: {
+                    ScrollVertical().toolbar {
+                        EditButton()
+                    }
+                }, label: {
+                    Image("so-trash")
+                })
+                
+            }
+            Divider()
+            ScrollVertical()
+        }
+        
+    }
+}
+
+
+struct TrashView: View {
+    
+    @State var numbers = ["Record1","Record2","Record3","Record4","Record5","Record6","Record1Seven","Record1Eight","Record1Nine","Record1Ten"]
+    @State var editMode = EditMode.inactive
+    @State var selection = Set<String>()
+    
+    var body: some View {
+        NavigationView {
+            List(selection: $selection) {
+                ForEach(numbers, id: \.self) { number in
+                    Text(number)
+                }
+            }
+            .navigationBarItems(leading: deleteButton, trailing: editButton)
+            .environment(\.editMode, self.$editMode)
+        }
+    }
+    private var editButton: some View {
+        if editMode == .inactive {
+            return Button(action: {
+                self.editMode = .active
+                self.selection = Set<String>()
+            }) {
+                Text("Edit")
+            }
+        }
+        else {
+            return Button(action: {
+                self.editMode = .inactive
+                self.selection = Set<String>()
+            }) {
+                Text("Done")
+            }
+        }
+    }
+    
+    private var deleteButton: some View {
+        if editMode == .inactive {
+            return Button(action: {}) {
+                Image(systemName: "")
+            }
+        } else {
+            return Button(action: deleteNumbers) {
+                Image(systemName: "trash")
+            }
+        }
+    }
+    
+    private func deleteNumbers() {
+        for id in selection {
+            if let index = numbers.lastIndex(where: { $0 == id })  {
+                numbers.remove(at: index)
+            }
+        }
+        selection = Set<String>()
+    }
+}
+
+
+struct ScrollVertical: View{
+    
+    //    @ObservedObject var model = PersonModel()
+    @ObservedObject var data = NewPersonModel()
+    @State var editMode = EditMode.inactive
+    @State var selection = Set<String>()
+    
+    
+    var body: some View {
+        
+        //        NavigationView {
+        ZStack(alignment: .bottomTrailing){
+            Rectangle().frame(height: 0)
+            //                NavigationView{
+            List(data.Friends, id: \.self){ friend in //selection: $selection, 추가해야함 **
+                //                        ForEach(data.Friends){ friend in
+                HStack{
+                    Image(systemName: "person.circle.fill").resizable().frame(width: 37, height: 37)
+                        .foregroundColor(Color.random())
+                    VStack(alignment: .leading) {
+                        
+                        Text(friend.nickName)
+                            .font(.subheadline)
+                            .fontWeight(.semibold)
+                        Text(friend.promise)
+                            .fontWeight(.semibold)
+                            .font(.caption2)
+                            .foregroundColor(.gray)
+                        
+                    }
+                    Spacer()
+                    Image(systemName: "star.fill").foregroundColor(.yellow)
+                    Text(String(friend.stars)).frame(width: 25, height: 25, alignment: .leading)
+                    
+                }.listRowSeparator(.hidden)
+                
+                //                        }
+                //                    .onDelete { index in
+                //                    }
+                
+            }
+            //                    .navigationBarItems(leading: deleteButton, trailing: editButton)
+            //                    .environment(\.editMode, self.$editMode)
+            .listStyle(PlainListStyle())
+            
+            Button(action: {
+                print("Floating Button Click")
+            }, label: {
+                NavigationLink(destination: FriendSearchView()) {
+                    Image("Group 65").frame(width: 51, height: 51, alignment: .bottomTrailing)
+                }
+            })
+        }
+    }
+}
+//    }
+//    private var editButton: some View {
+//        if editMode == .inactive {
+//            return Button(action: {
+//                self.editMode = .active
+//                self.selection = Set<String>()
+//            }) {
+//                Text("Edit")
+//            }
+//        }
+//        else {
+//            return Button(action: {
+//                self.editMode = .inactive
+//                self.selection = Set<String>()
+//            }) {
+//                Text("Done")
+//            }
+//        }
+//    }
+//
+//    private var deleteButton: some View {
+//        if editMode == .inactive {
+//            return Button(action: {}) {
+//                Image(systemName: "")
+//            }
+//        } else {
+//            return Button(action: deleteNumbers) {
+//                Image(systemName: "trash")
+//            }
+//        }
+//    }
+//
+//    private func deleteNumbers() {
+//        for id in selection {
+//            if let index = names.lastIndex(where: { $0 == id })  { //변경해야함
+//                model.people.remove(at: index)
+//            }
+//        }
+//        selection = Set<String>()
+//    }
+//}
+
+
+
+struct BetterMeView: View{
+    
+    var body: some View{
+        Rectangle().frame(height: 0)
+        Button(action: {
+            print("홈으로 이동")
+        }, label: {
+            Image("BetterMe")
+                .padding(.top, 17.0).padding(.leading, 18).padding(.bottom, 28)
+        })
+    }
+    
+}
+
+
+
+struct ContentView: View {
+    
+    @State var tabIndex = 0
+    @Namespace var animation
+    
+    var body: some View {
+        
+        NavigationView() {
+            VStack(alignment: .leading){
+                Rectangle().frame(height: 0)
+                Button(action: {
+                    print("홈으로 이동")
+                }, label: {
+                    Image("BetterMe")
+                        .padding(.top, 17.0).padding(.leading, 18).padding(.bottom, 28)
+                })
+                
+                //            TabView{
+                //                Text("home").tabItem{
+                //                    Image(systemName: "house")
+                //                }
+                VStack{
+                    CustomTopTabBar(tabIndex: $tabIndex)
+                    if tabIndex == 0 {
+                        FriendView()
+                    }
+                    else if tabIndex == 1 {
+                        SecondView()
+                    }
+                    else if tabIndex == 2{
+                        ThirdView()
+                    }
+                    Spacer()
+                }
+                .frame(width: UIScreen.main.bounds.width - 24, alignment: .center)
+                .padding(.horizontal, 12).tabItem{
+                    Image(systemName: "medal")
+                    
+                    //                }
+                    //                Text("earth").tabItem{
+                    //                    Image(systemName: "globe")
+                    //                }
+                    //                Text("mypage").tabItem{
+                    //                    Image(systemName: "person")
+                    //                }
+                    //            }
+                }
+            }
+        }
+    }
+    
+    
+    
+    struct ContentView_Previews: PreviewProvider {
+        static var previews: some View {
+            FriendView()
+            ContentView()
+            FriendSearchView()
+            //            homeView()
+            
+        }
+    }
+    
+}

From 4266857058e88cf4942adc351a2c58951d5f478d Mon Sep 17 00:00:00 2001
From: pingu00 <58204852+pingu00@users.noreply.github.com>
Date: Fri, 10 Feb 2023 00:22:37 +0900
Subject: [PATCH 3/4] =?UTF-8?q?alamo=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Better-me-iOS.xcodeproj/project.pbxproj         | 17 -----------------
 .../xcschemes/xcschememanagement.plist          |  2 +-
 .../xcshareddata/IDEWorkspaceChecks.plist       |  8 ++++++++
 .../xcshareddata/swiftpm/Package.resolved       |  9 ---------
 4 files changed, 9 insertions(+), 27 deletions(-)
 create mode 100644 Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

diff --git a/Better-me-iOS.xcodeproj/project.pbxproj b/Better-me-iOS.xcodeproj/project.pbxproj
index 7ca3274..dc8c267 100644
--- a/Better-me-iOS.xcodeproj/project.pbxproj
+++ b/Better-me-iOS.xcodeproj/project.pbxproj
@@ -14,7 +14,6 @@
 		280F5E5E2983B25F000A30B3 /* PWEditController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 280F5E592983B25F000A30B3 /* PWEditController.swift */; };
 		3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EA298FCE5E0054096A /* PersonModel.swift */; };
 		3B7049ED298FCE5E0054096A /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EB298FCE5E0054096A /* Person.swift */; };
-		3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = 3B9BDE05298FC40000CC0C45 /* Alamofire */; };
 		3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */; };
 		3BA12295298A967B000E38A8 /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = 3BA12294298A967B000E38A8 /* PopupView */; };
 		3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */; };
@@ -126,7 +125,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				3BA12295298A967B000E38A8 /* PopupView in Frameworks */,
-				3B9BDE06298FC40000CC0C45 /* Alamofire in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -251,7 +249,6 @@
 			name = "Better-me-iOS";
 			packageProductDependencies = (
 				3BA12294298A967B000E38A8 /* PopupView */,
-				3B9BDE05298FC40000CC0C45 /* Alamofire */,
 			);
 			productName = "Better-me-iOS";
 			productReference = BECC4B35296C3AB60037807F /* Better-me-iOS.app */;
@@ -283,7 +280,6 @@
 			mainGroup = BECC4B2C296C3AB60037807F;
 			packageReferences = (
 				3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */,
-				3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */,
 			);
 			productRefGroup = BECC4B36296C3AB60037807F /* Products */;
 			projectDirPath = "";
@@ -580,14 +576,6 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/Alamofire/Alamofire.git";
-			requirement = {
-				branch = master;
-				kind = branch;
-			};
-		};
 		3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/exyte/PopupView.git";
@@ -599,11 +587,6 @@
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		3B9BDE05298FC40000CC0C45 /* Alamofire */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 3B9BDE04298FC40000CC0C45 /* XCRemoteSwiftPackageReference "Alamofire" */;
-			productName = Alamofire;
-		};
 		3BA12294298A967B000E38A8 /* PopupView */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */;
diff --git a/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist b/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist
index 314f52e..7ffd81c 100644
--- a/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Better-me-iOS.xcodeproj/xcuserdata/abc.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -7,7 +7,7 @@
 		<key>Better-me-iOS.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>0</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 </dict>
diff --git a/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000..18d9810
--- /dev/null
+++ b/Better-me-iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 5ad8d71..dc06702 100644
--- a/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,14 +1,5 @@
 {
   "pins" : [
-    {
-      "identity" : "alamofire",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/Alamofire/Alamofire.git",
-      "state" : {
-        "branch" : "master",
-        "revision" : "ce0fb463a8f95fc8363c99fab1ea197553af5dfe"
-      }
-    },
     {
       "identity" : "popupview",
       "kind" : "remoteSourceControl",

From 4a26fcde80ab6d6af06222ac707417132e50a664 Mon Sep 17 00:00:00 2001
From: pingu00 <58204852+pingu00@users.noreply.github.com>
Date: Fri, 10 Feb 2023 00:31:09 +0900
Subject: [PATCH 4/4] =?UTF-8?q?popupView=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Better-me-iOS.xcodeproj/project.pbxproj       | 23 -------------------
 .../xcshareddata/swiftpm/Package.resolved     | 14 -----------
 2 files changed, 37 deletions(-)
 delete mode 100644 Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved

diff --git a/Better-me-iOS.xcodeproj/project.pbxproj b/Better-me-iOS.xcodeproj/project.pbxproj
index dc8c267..5629aa3 100644
--- a/Better-me-iOS.xcodeproj/project.pbxproj
+++ b/Better-me-iOS.xcodeproj/project.pbxproj
@@ -15,7 +15,6 @@
 		3B7049EC298FCE5E0054096A /* PersonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EA298FCE5E0054096A /* PersonModel.swift */; };
 		3B7049ED298FCE5E0054096A /* Person.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3B7049EB298FCE5E0054096A /* Person.swift */; };
 		3BA12292298A94EA000E38A8 /* SwiftUIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA12291298A94EA000E38A8 /* SwiftUIView.swift */; };
-		3BA12295298A967B000E38A8 /* PopupView in Frameworks */ = {isa = PBXBuildFile; productRef = 3BA12294298A967B000E38A8 /* PopupView */; };
 		3BA122E3298AA5E9000E38A8 /* SocialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BA122E2298AA5E9000E38A8 /* SocialViewController.swift */; };
 		3BE30E58299535A9004B3F23 /* Request_FriendModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E40299535A7004B3F23 /* Request_FriendModel.swift */; };
 		3BE30E59299535A9004B3F23 /* Request_Friend.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3BE30E41299535A8004B3F23 /* Request_Friend.swift */; };
@@ -124,7 +123,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3BA12295298A967B000E38A8 /* PopupView in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -248,7 +246,6 @@
 			);
 			name = "Better-me-iOS";
 			packageProductDependencies = (
-				3BA12294298A967B000E38A8 /* PopupView */,
 			);
 			productName = "Better-me-iOS";
 			productReference = BECC4B35296C3AB60037807F /* Better-me-iOS.app */;
@@ -279,7 +276,6 @@
 			);
 			mainGroup = BECC4B2C296C3AB60037807F;
 			packageReferences = (
-				3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */,
 			);
 			productRefGroup = BECC4B36296C3AB60037807F /* Products */;
 			projectDirPath = "";
@@ -574,25 +570,6 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
-
-/* Begin XCRemoteSwiftPackageReference section */
-		3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/exyte/PopupView.git";
-			requirement = {
-				branch = master;
-				kind = branch;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
-/* Begin XCSwiftPackageProductDependency section */
-		3BA12294298A967B000E38A8 /* PopupView */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 3BA12293298A967B000E38A8 /* XCRemoteSwiftPackageReference "PopupView" */;
-			productName = PopupView;
-		};
-/* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = BECC4B2D296C3AB60037807F /* Project object */;
 }
diff --git a/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
deleted file mode 100644
index dc06702..0000000
--- a/Better-me-iOS.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "pins" : [
-    {
-      "identity" : "popupview",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/exyte/PopupView.git",
-      "state" : {
-        "branch" : "master",
-        "revision" : "ee306aede532d941c05ff8c63b3b0f3b8cc208cc"
-      }
-    }
-  ],
-  "version" : 2
-}