feat : Edit service on service detail page and loading photo on temps…

…torage(needs modification)
sdp-tech · Feb 3, 2025 · c7e9a95 · c7e9a95
1 parent 19e87c0
commit c7e9a95
Show file tree

Hide file tree

Showing 15 changed files with 522 additions and 335 deletions.
diff --git a/src/assets/common/Pencil.svg b/src/assets/common/Pencil.svg
diff --git a/src/assets/common/Pencil2.svg b/src/assets/common/Pencil2.svg
diff --git a/src/assets/common/Trash.svg b/src/assets/common/Trash.svg
diff --git a/src/common/Footer.tsx b/src/common/Footer.tsx
@@ -5,9 +5,10 @@ import BottomButton from './BottomButton';
 import { View } from 'react-native';
 interface FooterProps {
   suspended: boolean; // 중단된 서비스인지 여부.
+  hideButton: boolean;
 }
 
-const Footer: React.FC<FooterProps> = ({ suspended }) => {
+const Footer: React.FC<FooterProps> = ({ suspended, hideButton }) => {
   // API 연결 전, 인터랙션만
   const [like, setLike] = useState<boolean>(false);
   const [pressed, setPressed] = useState<boolean>(false);
@@ -16,12 +17,14 @@ const Footer: React.FC<FooterProps> = ({ suspended }) => {
     <View>
       <FooterContainer style={{ paddingTop: 10 }}>
         {/* <HeartButton like={like} onPress={() => { setLike(!like) }} blank /> */}
-        <BottomButton
-          value={value}
-          pressed={pressed}
-          onPress={() => {}}
-          style={{ width: '95%' }}
-        />
+        {!hideButton && (
+            <BottomButton
+                value={value}
+                pressed={pressed}
+                onPress={() => {}}
+                style={{ width: '95%' }}
+            />
+        )}
       </FooterContainer>
     </View>
   );

diff --git a/src/common/requests.js b/src/common/requests.js
@@ -16,7 +16,7 @@ export default function Request() {
     // upcy temp api url:  http://52.78.43.6:8000/
     // upcy domain: http://upcy.co.kr:8000/
 
-    const url = 'https://upcy.co.kr' + path;
+    const url = 'https://api.sullung.site' + path;
 
     let headerValue;
 

diff --git a/src/components/Auth/Login.tsx b/src/components/Auth/Login.tsx
@@ -143,8 +143,8 @@ export async function processLoginResponse( // 통상 로그인시 호출 함수
           try {
             const response = await request.get(`/api/market`, {}, headers)
             if (response.status && response.status === 200) {
-              setMarketUUID(response.data[0].market_uuid);
-              console.log('processLogin에서:', response.data[0].market_uuid)
+              setMarketUUID(response.data.market_uuid);
+              console.log('processLogin에서:', response.data.market_uuid)
             } else {
               console.log('processLogin에서 MarketUUID 저장 실패:', response);
             }

diff --git a/src/components/Auth/Reformer/ReformerMyPage.tsx b/src/components/Auth/Reformer/ReformerMyPage.tsx
@@ -229,12 +229,10 @@ export const ReformerMyPageScreen = ({
           // 본인 마켓 정보 가져오기: 링크, 자기소개, 닉네임, uuid
           const response2 = await request.get(`/api/market`, {}, headers);
           if (response2 && response2.status === 200) {
-            const marketResult: MarketResponseType = response2.data[0];
+            const marketResult: MarketResponseType = response2.data;
             setMarketResponseData(marketResult);
-            const marketUUID = await getMarketUUID();
             fetchMarketData({
-              //market_thumbnail: marketResult.market_thumbnail || '', // 기본값 유지
-              market_uuid: marketUUID || marketResult.market_uuid,
+              market_uuid: marketResult.market_uuid,
             });
             console.log('마켓 정보 가져오기 성공', response2.data);
             try {

diff --git a/src/components/Home/Market/Service.tsx b/src/components/Home/Market/Service.tsx
@@ -1,4 +1,5 @@
 import { useState, useEffect } from 'react';
+import { useFocusEffect } from '@react-navigation/native';
 // FIXME: 이거 사용
 import {
   View,
@@ -103,6 +104,7 @@ const EntireServiceMarket = ({
     region: '',
   });
 
+
   const [modalOpen, setModalOpen] = useState<boolean>(false);
   const [loading, setLoading] = useState(true); // 로딩용
   const request = Request();
@@ -173,9 +175,10 @@ const EntireServiceMarket = ({
   };
 
   const extractData = (rawData: ServiceResponseType[]) => {
-    return rawData.map(service => ({
+    return rawData.map(service => {
       //TODO: 밑에 수정
-      name: service.reformer_nickname,
+      return {
+      name: service.reformer_info?.user_info?.nickname || "Reformer",
       created: service.created || new Date('2023-12-12'),
       basic_price: service.basic_price,
       max_price: service.max_price,
@@ -203,7 +206,7 @@ const EntireServiceMarket = ({
         : [],
       temporary: service.temporary,
       suspended: service.suspended,
-    })) as ServiceCardProps[];
+    }}) as ServiceCardProps[];
   };
 
   // 컴포넌트가 처음 렌더링될 때 API 호출