Dev homeview

Views/LocationRegistration.swift

@@ -173,9 +173,9 @@ struct LocationRegistration: View {
 //        }
         // 2.db의 users의 uid같은거에서 유저네임 수정.
         Firestore.firestore().collection("users").document("\(userid)").setData([
-            "roadAddr" : searchJusoViewModel.jusodata.roadAddr,
-            "sggNm" : searchJusoViewModel.jusodata.sggNm,
-            "emdNm" : searchJusoViewModel.jusodata.emdNm,
+            "roadAddr" : searchJusoViewModel.jusodata.roadAddr ?? "",
+            "sggNm" : searchJusoViewModel.jusodata.sggNm ?? "",
+            "emdNm" : searchJusoViewModel.jusodata.emdNm ?? "",
             "latitude" : searchJusoViewModel.searchLatitude,
             "longitude" : searchJusoViewModel.searchLongitude]
             , merge: true) { err in

Views/NeighborGridView.swift

@@ -22,8 +22,8 @@ class NeighborViewModel: ObservableObject {
     func getUserLocation() {
         db.collection("users").document(userid).getDocument { [self] user, err in
             if let user = user {
-                self.userLatitude = user.get("latitude") as! String
-                self.userLongitude = user.get("longitude") as! String
+                self.userLatitude = user.get("latitude") as? String ?? ""
+                self.userLongitude = user.get("longitude") as? String ?? ""
             } else {
                 if let err = err {
                     print("Error getting documents: \(err)")

Views/TestBookmarkView.swift

@@ -162,6 +162,8 @@ struct TestBookmarkViewImageRow: View {
 
 
     var body: some View {
+
+
         VStack(alignment: .leading, spacing: 10){
             ZStack(alignment: .topTrailing ){
                 if let image = libModel.image {
@@ -175,14 +177,36 @@ struct TestBookmarkViewImageRow: View {
                     .padding(EdgeInsets(top: 10, leading: 0, bottom: 0, trailing: 10))
 
             }
-            HStack (alignment: .top, spacing: 10){
+            HStack (alignment: .top){
+            if libModel.bookname.count > 15 {
+                Text(libModel.bookname.prefix(15) + "…")
+                    .font(.system(size: 15, weight: .bold))
+                    .foregroundColor(.mainBlue)
+                +
+                Text(" ")
+                +
+                Text(libModel.title)
+                    .font(.system(size: 15, weight: .light))
+                    .foregroundColor(.black)
+                }
+            else {
                 Text(libModel.bookname)
-                    .font(.system(size: 12, weight: .bold))
+                    .font(.system(size: 15, weight: .bold))
                     .foregroundColor(.mainBlue)
+                +
+                Text(" ")
+                +
                 Text(libModel.title)
-                    .font(.system(size: 12, weight: .light))
+                    .font(.system(size: 15, weight: .light))
                     .foregroundColor(.black)
+                }
             }
+
+                .multilineTextAlignment(.leading)
+                .lineLimit(2)
+                .frame(height: 45)
+                .truncationMode(.tail)
+
             .padding(.bottom, 10)
         }
     }