Merge pull request #35 from snuhcs-course/hotfix_last

last fix
snuhcs-course · Dec 10, 2023 · 45183af · 45183af
2 parents 31b6eb5 + 4bb2e3b
commit 45183af
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/frontend/app/src/main/java/com/team13/fooriend/ui/screen/home/HomeScreen.kt b/frontend/app/src/main/java/com/team13/fooriend/ui/screen/home/HomeScreen.kt
@@ -271,7 +271,7 @@ fun HomeScreen(
                                 CustomMarkerRenderer(context, map, clusterManager)
                             val defaultClusterRenderer =
                                 clusterManager.renderer as DefaultClusterRenderer<MyItem>
-                            defaultClusterRenderer.minClusterSize = 3
+                            defaultClusterRenderer.minClusterSize = 10
                             clusterManager.cluster()
 
                             defaultClusterRenderer.setOnClusterItemClickListener {

diff --git a/frontend/app/src/main/java/com/team13/fooriend/ui/screen/login/LogInScreen.kt b/frontend/app/src/main/java/com/team13/fooriend/ui/screen/login/LogInScreen.kt
@@ -75,7 +75,7 @@ fun LogInScreen(
     val color = if (isPressed) CRed else Color.DarkGray//CDarkGreen
     val coroutineScope = rememberCoroutineScope()
     val retrofit = Retrofit.Builder()
-        .baseUrl("http://ec2-54-180-101-207.ap-northeast-2.compute.amazonaws.com")
+        .baseUrl("http://ec2-13-125-245-104.ap-northeast-2.compute.amazonaws.com")
         .addConverterFactory(GsonConverterFactory.create())
         .build()
 
@@ -162,6 +162,7 @@ fun LogInScreen(
                     try{
                         response = apiService.login(LoginBody(id, password))
                     } catch(e: Exception){
+                        Log.d("LogInScreen", "error: $e")
                         Toast.makeText(context, "아이디 또는 비밀번호가 일치하지 않습니다.", Toast.LENGTH_SHORT).show()
                         return@launch
                     }

diff --git a/frontend/app/src/main/java/com/team13/fooriend/ui/screen/signup/SignUpScreen.kt b/frontend/app/src/main/java/com/team13/fooriend/ui/screen/signup/SignUpScreen.kt
@@ -81,7 +81,7 @@ fun SignUpScreen(
 
 //    val (phoneNumber, phoneNumberValue) = remember { mutableStateOf("") }
     val retrofit = Retrofit.Builder()
-        .baseUrl("http://ec2-54-180-101-207.ap-northeast-2.compute.amazonaws.com")
+        .baseUrl("http://ec2-13-125-245-104.ap-northeast-2.compute.amazonaws.com")
         .addConverterFactory(GsonConverterFactory.create())
         .build()
 

diff --git a/frontend/app/src/main/java/com/team13/fooriend/ui/util/AccessToken.kt b/frontend/app/src/main/java/com/team13/fooriend/ui/util/AccessToken.kt
@@ -31,7 +31,7 @@ fun createRetrofit(context: Context): Retrofit {
         .build()
 
     return Retrofit.Builder()
-        .baseUrl("http://ec2-54-180-101-207.ap-northeast-2.compute.amazonaws.com")
+        .baseUrl("http://ec2-13-125-245-104.ap-northeast-2.compute.amazonaws.com")
         .addConverterFactory(GsonConverterFactory.create())
         .client(okHttpClient)
         .build()

diff --git a/frontend/app/src/main/java/com/team13/fooriend/ui/util/LoginSuccess.kt b/frontend/app/src/main/java/com/team13/fooriend/ui/util/LoginSuccess.kt
@@ -21,7 +21,7 @@ fun LoginSuccess(context: Context, navController: NavHostController = rememberNa
         "restaurant/{restaurantId}" -> false
         "reviewDetail/{reviewId}" -> false
         "fooriend/{userId}" -> false
-        "writeReview/{restaurantPlaceId}" -> false
+        "writeReview/{restaurantPlaceId}/{restaurantName}" -> false
         "logout" -> false
         "myInfo" -> false
         else -> true // in all other cases show the bottom bar

diff --git a/frontend/app/src/main/res/xml/network_security_config.xml b/frontend/app/src/main/res/xml/network_security_config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
-        <domain includeSubdomains="true">ec2-54-180-101-207.ap-northeast-2.compute.amazonaws.com</domain>
+        <domain includeSubdomains="true">ec2-13-125-245-104.ap-northeast-2.compute.amazonaws.com</domain>
     </domain-config>
 </network-security-config>