From ed231fcf9f542e131d23487636d431d8eb38f10f Mon Sep 17 00:00:00 2001 From: 11t518s <11t518s20161759@gmail.com> Date: Fri, 1 Apr 2022 01:49:15 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=95=88=EB=93=9C=20=EB=B0=B0=ED=8F=AC?= =?UTF-8?q?=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20=EC=95=88=EB=93=9C=EB=A1=9C?= =?UTF-8?q?=EC=9D=B4=EB=93=9C=20=EC=95=A0=ED=94=8C=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EC=9D=B8=20=EA=B8=88=EC=A7=80=20=EC=88=98=EC=A0=95=20#70?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.tsx | 15 +- android/app/build.gradle | 2 +- android/gradle.properties | 1 + .../ProfileSettingComponent.tsx | 18 +- components/camera/CameraAndGallery.tsx | 2 + ios/Podfile | 2 +- ios/Podfile.lock | 28 +++- ios/amattang.xcodeproj/project.pbxproj | 4 +- package-lock.json | 158 ------------------ package.json | 3 +- screens/Landing/Login.tsx | 4 +- screens/bottomTab/Home.tsx | 12 +- 12 files changed, 67 insertions(+), 182 deletions(-) diff --git a/App.tsx b/App.tsx index c2cc5b5..88f26ae 100644 --- a/App.tsx +++ b/App.tsx @@ -6,12 +6,9 @@ import RootNav from './navigation/Main/RootNav'; import OnBoardingStack from './navigation/OnBoarding/StackNavigationOfOnBoarding'; import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'; import { getAccessToken, isLoggedIn } from 'react-native-axios-jwt'; -import { QueryClient, QueryClientProvider } from 'react-query'; import CheckListStore from './Context/CheckListByServer'; import axios from 'axios'; -const queryClient = new QueryClient(); - function App() { const [isLogin, setIsLogin] = useState(false); @@ -36,13 +33,11 @@ function App() { - - {isLogin ? ( - - ) : ( - - )} - + {isLogin ? ( + + ) : ( + + )} diff --git a/android/app/build.gradle b/android/app/build.gradle index 879b9df..8032f32 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,7 +149,7 @@ android { applicationId "com.amattang" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 + versionCode 2 versionName "1.0" manifestPlaceholders = [GOOGLE_MAP_API_KEY:googleMapApiKey, KAKAO_NATIVE_APP_KEY:kakaoLoginApiKey] // manifestPlaceholders = [KAKAO_NATIVE_APP_KEY:kakaoLoginApiKey] diff --git a/android/gradle.properties b/android/gradle.properties index 09c427e..fe1a4dd 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -23,6 +23,7 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true +org.gradle.jvmargs=-Xms1024m -Xmx4096m # Version of flipper SDK to use with React Native FLIPPER_VERSION=0.99.0 diff --git a/components/ProfileSetting/ProfileSettingComponent.tsx b/components/ProfileSetting/ProfileSettingComponent.tsx index 2f44733..8b8edb3 100644 --- a/components/ProfileSetting/ProfileSettingComponent.tsx +++ b/components/ProfileSetting/ProfileSettingComponent.tsx @@ -3,11 +3,22 @@ import { View, Image, Pressable, Linking, ScrollView } from 'react-native'; import { DefaultText } from '../../CustomText'; import styles from './styles'; import { clearAuthTokens } from 'react-native-axios-jwt'; +import axios from 'axios'; interface IProps { setIsLogin: Dispatch>; } function ProfileSettingComponent({ setIsLogin }: IProps) { + const onWithdrawalHandler = async () => { + try { + await axios.delete('/user'); + clearAuthTokens(); + setIsLogin(false); + console.log('t'); + } catch (error) { + console.log(error); + } + }; const onLogoutHandler = () => { clearAuthTokens(); setIsLogin(false); @@ -30,7 +41,7 @@ function ProfileSettingComponent({ setIsLogin }: IProps) { Linking.openURL('https://www.instagram.com/a_ma_ttang/')} + onPress={() => Linking.openURL('https://www.instagram.com/a.ma.ttang/')} style={styles.profileSettingEachElementWrapper} > @@ -88,7 +99,10 @@ function ProfileSettingComponent({ setIsLogin }: IProps) { > 로그아웃 - + 회원탈퇴 diff --git a/components/camera/CameraAndGallery.tsx b/components/camera/CameraAndGallery.tsx index 185e4a8..5ccd00f 100644 --- a/components/camera/CameraAndGallery.tsx +++ b/components/camera/CameraAndGallery.tsx @@ -40,6 +40,7 @@ function CameraAndGallery({ setOnModal, onModal }: IProps) { multiple: true, }).then((images: any) => { onPostImageDataHandler(images); + setOnModal(!onModal); }); const onCamera = () => @@ -47,6 +48,7 @@ function CameraAndGallery({ setOnModal, onModal }: IProps) { cropping: true, }).then((images: any) => { onPostImageDataHandler(images); + setOnModal(!onModal); }); return ( diff --git a/ios/Podfile b/ios/Podfile index 5d1c191..1eb279a 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -14,7 +14,7 @@ target 'amattang' do use_react_native!( :path => config[:reactNativePath], # to enable hermes on iOS, change `false` to `true` and then install pods - :hermes_enabled => false + :hermes_enabled => true ) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index beb8d8e..ea03337 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -97,6 +97,7 @@ PODS: - GoogleMaps/Base (5.1.0) - GoogleMaps/Maps (5.1.0): - GoogleMaps/Base + - hermes-engine (0.9.0) - kakao-login (3.4.3): - KakaoSDK (~> 2.4.0) - KakaoSDKAuth (~> 2.4.0) @@ -152,6 +153,12 @@ PODS: - DoubleConversion - fmt (~> 6.2.1) - glog + - RCT-Folly/Futures (2021.06.28.00-v2): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - libevent - RCTRequired (0.67.2) - RCTTypeSafety (0.67.2): - FBLazyVector (= 0.67.2) @@ -318,6 +325,17 @@ PODS: - React-logger (= 0.67.2) - React-perflogger (= 0.67.2) - React-runtimeexecutor (= 0.67.2) + - React-hermes (0.67.2): + - DoubleConversion + - glog + - hermes-engine + - RCT-Folly (= 2021.06.28.00-v2) + - RCT-Folly/Futures (= 2021.06.28.00-v2) + - React-cxxreact (= 0.67.2) + - React-jsi (= 0.67.2) + - React-jsiexecutor (= 0.67.2) + - React-jsinspector (= 0.67.2) + - React-perflogger (= 0.67.2) - React-jsi (0.67.2): - boost (= 1.76.0) - DoubleConversion @@ -502,7 +520,9 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - hermes-engine (~> 0.9.0) - "kakao-login (from `../node_modules/@react-native-seoul/kakao-login`)" + - libevent (~> 2.1.12) - OpenSSL-Universal (= 1.1.180) - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -514,6 +534,7 @@ DEPENDENCIES: - React-Core/RCTWebSocket (from `../node_modules/react-native/`) - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) @@ -563,6 +584,7 @@ SPEC REPOS: - fmt - Google-Maps-iOS-Utils - GoogleMaps + - hermes-engine - KakaoSDK - KakaoSDKAuth - KakaoSDKCommon @@ -606,6 +628,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/CoreModules" React-cxxreact: :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-hermes: + :path: "../node_modules/react-native/ReactCommon/hermes" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -691,6 +715,7 @@ SPEC CHECKSUMS: glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85 Google-Maps-iOS-Utils: 95d5ca4d2004314eff88c1819b969db6cac37ab6 GoogleMaps: 086ae1dab659eaa7339bdb30fc88e2f44e7c597c + hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c kakao-login: f5633a612ae8af34edacf4f9d8bed87964a18117 KakaoSDK: 1e80d6877c0eac6a310f93c73fb15ca56c05f2bd KakaoSDKAuth: fcba1c9ede431683f5bdd84c835a96981cb115a5 @@ -711,6 +736,7 @@ SPEC CHECKSUMS: React-Core: e382655566b2b9a6e3b4f641d777b7bfdbe52358 React-CoreModules: cf262e82fa101c0aee022b6f90d1a5b612038b64 React-cxxreact: 69d53de3b30c7c161ba087ca1ecdffed9ccb1039 + React-hermes: 0ce480a2225907bdcf4c8e931f89cf2dc1df8b27 React-jsi: ce9a2d804adf75809ce2fe2374ba3fbbf5d59b03 React-jsiexecutor: 52beb652bbc61201bd70cbe4f0b8edb607e8da4f React-jsinspector: 595f76eba2176ebd8817a1fffd47b84fbdab9383 @@ -746,6 +772,6 @@ SPEC CHECKSUMS: Yoga: 9b6696970c3289e8dea34b3eda93f23e61fb8121 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 4d8c02a502ba230519bdc76caaed1177ed2d3a33 +PODFILE CHECKSUM: 9e0f7f3debdda237247d1098ba5474a256182282 COCOAPODS: 1.11.2 diff --git a/ios/amattang.xcodeproj/project.pbxproj b/ios/amattang.xcodeproj/project.pbxproj index 507ff2c..4b6c6b0 100644 --- a/ios/amattang.xcodeproj/project.pbxproj +++ b/ios/amattang.xcodeproj/project.pbxproj @@ -624,7 +624,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -689,7 +689,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; diff --git a/package-lock.json b/package-lock.json index 3f0397e..e4f6d87 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,6 @@ "react-native-tab-view": "^3.1.1", "react-native-uuid": "^2.0.1", "react-native-webview": "^11.17.2", - "react-query": "^3.34.16", "react-scripts": "^5.0.0" }, "devDependencies": { @@ -6781,21 +6780,6 @@ "node": ">=8" } }, - "node_modules/broadcast-channel": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz", - "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==", - "dependencies": { - "@babel/runtime": "^7.7.2", - "detect-node": "^2.1.0", - "js-sha3": "0.8.0", - "microseconds": "0.2.0", - "nano-time": "1.0.0", - "oblivious-set": "1.0.0", - "rimraf": "3.0.2", - "unload": "2.2.0" - } - }, "node_modules/browser-process-hrtime": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", @@ -14516,11 +14500,6 @@ "@sideway/pinpoint": "^2.0.0" } }, - "node_modules/js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -15117,15 +15096,6 @@ "node": ">=0.10.0" } }, - "node_modules/match-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz", - "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "remove-accents": "0.4.2" - } - }, "node_modules/mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", @@ -15654,11 +15624,6 @@ "node": ">=8.6" } }, - "node_modules/microseconds": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz", - "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==" - }, "node_modules/mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -15835,14 +15800,6 @@ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, - "node_modules/nano-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz", - "integrity": "sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=", - "dependencies": { - "big-integer": "^1.6.16" - } - }, "node_modules/nanoid": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", @@ -16351,11 +16308,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/oblivious-set": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz", - "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==" - }, "node_modules/obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -18806,31 +18758,6 @@ "async-limiter": "~1.0.0" } }, - "node_modules/react-query": { - "version": "3.34.16", - "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.34.16.tgz", - "integrity": "sha512-7FvBvjgEM4YQ8nPfmAr+lJfbW95uyW/TVjFoi2GwCkF33/S8ajx45tuPHPFGWs4qYwPy1mzwxD4IQfpUDrefNQ==", - "dependencies": { - "@babel/runtime": "^7.5.5", - "broadcast-channel": "^3.4.1", - "match-sorter": "^6.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, "node_modules/react-refresh": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz", @@ -20554,11 +20481,6 @@ "node": ">= 0.10" } }, - "node_modules/remove-accents": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz", - "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=" - }, "node_modules/remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -23263,15 +23185,6 @@ "node": ">= 4.0.0" } }, - "node_modules/unload": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", - "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==", - "dependencies": { - "@babel/runtime": "^7.6.2", - "detect-node": "^2.0.4" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -29296,21 +29209,6 @@ "fill-range": "^7.0.1" } }, - "broadcast-channel": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/broadcast-channel/-/broadcast-channel-3.7.0.tgz", - "integrity": "sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==", - "requires": { - "@babel/runtime": "^7.7.2", - "detect-node": "^2.1.0", - "js-sha3": "0.8.0", - "microseconds": "0.2.0", - "nano-time": "1.0.0", - "oblivious-set": "1.0.0", - "rimraf": "3.0.2", - "unload": "2.2.0" - } - }, "browser-process-hrtime": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", @@ -34980,11 +34878,6 @@ "@sideway/pinpoint": "^2.0.0" } }, - "js-sha3": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz", - "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q==" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -35468,15 +35361,6 @@ "object-visit": "^1.0.0" } }, - "match-sorter": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/match-sorter/-/match-sorter-6.3.1.tgz", - "integrity": "sha512-mxybbo3pPNuA+ZuCUhm5bwNkXrJTbsk5VWbR5wiwz/GC6LIiegBGn2w3O08UG/jdbYLinw51fSQ5xNU1U3MgBw==", - "requires": { - "@babel/runtime": "^7.12.5", - "remove-accents": "0.4.2" - } - }, "mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", @@ -35947,11 +35831,6 @@ "picomatch": "^2.2.3" } }, - "microseconds": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/microseconds/-/microseconds-0.2.0.tgz", - "integrity": "sha512-n7DHHMjR1avBbSpsTBj6fmMGh2AGrifVV4e+WYc3Q9lO+xnSZ3NyhcBND3vzzatt05LFhoKFRxrIyklmLlUtyA==" - }, "mime": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", @@ -36079,14 +35958,6 @@ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=" }, - "nano-time": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/nano-time/-/nano-time-1.0.0.tgz", - "integrity": "sha1-sFVPaa2J4i0JB/ehKwmTpdlhN+8=", - "requires": { - "big-integer": "^1.6.16" - } - }, "nanoid": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz", @@ -36464,11 +36335,6 @@ "es-abstract": "^1.19.1" } }, - "oblivious-set": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/oblivious-set/-/oblivious-set-1.0.0.tgz", - "integrity": "sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==" - }, "obuf": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", @@ -38128,16 +37994,6 @@ } } }, - "react-query": { - "version": "3.34.16", - "resolved": "https://registry.npmjs.org/react-query/-/react-query-3.34.16.tgz", - "integrity": "sha512-7FvBvjgEM4YQ8nPfmAr+lJfbW95uyW/TVjFoi2GwCkF33/S8ajx45tuPHPFGWs4qYwPy1mzwxD4IQfpUDrefNQ==", - "requires": { - "@babel/runtime": "^7.5.5", - "broadcast-channel": "^3.4.1", - "match-sorter": "^6.0.2" - } - }, "react-refresh": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz", @@ -39448,11 +39304,6 @@ "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" }, - "remove-accents": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/remove-accents/-/remove-accents-0.4.2.tgz", - "integrity": "sha1-CkPTqq4egNuRngeuJUsoXZ4ce7U=" - }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -41500,15 +41351,6 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" }, - "unload": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/unload/-/unload-2.2.0.tgz", - "integrity": "sha512-B60uB5TNBLtN6/LsgAf3udH9saB5p7gqJwcFfbOEZ8BcBHnGwCf6G/TGiEqkRAxX7zAFIUtzdrXQSdL3Q/wqNA==", - "requires": { - "@babel/runtime": "^7.6.2", - "detect-node": "^2.0.4" - } - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", diff --git a/package.json b/package.json index d312350..6047db4 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,8 @@ "ios": "react-native run-ios", "start": "react-native start", "test": "jest", + "aab:android": "npm ci && cd android && ./gradlew bundleRelease && cd .. && open android/app/build/outputs/bundle/release", + "apk:android": "npm ci && cd android && ./gradlew assembleRelease && cd .. && open android/app/build/outputs/apk/release", "lint": "eslint . --ext .js,.jsx,.ts,.tsx", "clean": "react-native-clean-project" }, @@ -49,7 +51,6 @@ "react-native-tab-view": "^3.1.1", "react-native-uuid": "^2.0.1", "react-native-webview": "^11.17.2", - "react-query": "^3.34.16", "react-scripts": "^5.0.0" }, "devDependencies": { diff --git a/screens/Landing/Login.tsx b/screens/Landing/Login.tsx index 75bd459..fe2bdc2 100644 --- a/screens/Landing/Login.tsx +++ b/screens/Landing/Login.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { Image, Pressable, useWindowDimensions, View } from 'react-native'; +import { Image, Platform, Pressable, useWindowDimensions, View } from 'react-native'; import styles from './styles'; import { DefaultText } from '../../CustomText'; import KakaoLoginBtn from '../../components/Login/KakaoLoginBtn'; @@ -21,7 +21,7 @@ function Login({ setIsLogin }: any) { - + {Platform.OS === 'ios' ? : null} diff --git a/screens/bottomTab/Home.tsx b/screens/bottomTab/Home.tsx index 623071d..35a3507 100644 --- a/screens/bottomTab/Home.tsx +++ b/screens/bottomTab/Home.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import EmptyHome from '../../components/Home/EmptyHome'; import CheckListHome from '../../components/Home/CheckListHome'; import axios from 'axios'; -import { ActivityIndicator } from 'react-native'; +import { ActivityIndicator, RefreshControl, ScrollView } from 'react-native'; function Home() { const [loading, setLoading] = useState(false); @@ -22,16 +22,16 @@ function Home() { try { const response = await axios.get('/api/check-list'); setHomeCheckList(response.data.data); + if (response.data.data.length !== 0) setIsCheckList(true); } catch (error) { console.error(error); } - setIsCheckList(true); setLoading(true); }; useEffect(() => { getHomeDataHandler(); - }, []); + }); return ( <> @@ -43,7 +43,11 @@ function Home() { refreshing={refreshing} /> ) : ( - + } + > + + ) ) : (