Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 온보딩 세션 학생증 인증 기능 복원 및 인증 대기 화면 문구 수정 #211

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 9 additions & 16 deletions src/pages/onboarding/CompleteProfilePage.js
Original file line number Diff line number Diff line change
@@ -1,37 +1,32 @@
import React from "react";
import { View, Text, SafeAreaView, Dimensions } from "react-native";
// import { useNavigation } from "@react-navigation/native";
import { useNavigation } from "@react-navigation/native";
import { useTranslation } from "react-i18next";

import CompleteProfileStyles from "@pages/onboarding/CompleteProfileStyles";

import IconLoading from "@components/onboarding/IconLoading";
import ApplyButton from "@components/common/ApplyButton";

import { useAuth } from "src/states/AuthContext";

const CompleteProfilePage = () => {
const { t } = useTranslation();

// const navigation = useNavigation();
const navigation = useNavigation();

const { height: screenHeight } = Dimensions.get("window");
const isSmallScreen = screenHeight < 700;

const { setIsLoggedIn } = useAuth();

const handleMove = () => {
setIsLoggedIn(true);
};

return (
<SafeAreaView style={[CompleteProfileStyles.container]}>
<Text style={CompleteProfileStyles.textTitle}>
{t("profileCompletionTitle")}
</Text>
{/* <Text style={CompleteProfileStyles.textSubTitle}>
<Text style={CompleteProfileStyles.textSubTitle}>
{t("profileCompletionDescription")}
</Text> */}
</Text>
<Text style={CompleteProfileStyles.textDescription}>
{t("averageVerificationTime")}
</Text>
<View style={CompleteProfileStyles.iconLoading}>
<IconLoading />
</View>
Expand All @@ -42,10 +37,8 @@ const CompleteProfilePage = () => {
]}
>
<ApplyButton
// text={t("confirmButtonText")}
text="홈 화면으로 이동"
// onPress={() => navigation.navigate("LoadingVerification")}
onPress={handleMove}
text={t("confirmButtonText")}
onPress={() => navigation.navigate("LoadingVerification")}
/>
</View>
</SafeAreaView>
Expand Down
10 changes: 8 additions & 2 deletions src/pages/onboarding/CompleteProfileStyles.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { StyleSheet } from "react-native";
import { CustomTheme } from "@styles/CustomTheme.js";

const { fontHead24, fontHead18 } = CustomTheme;
const { fontHead24, fontHead18, fontSub16 } = CustomTheme;

const CompleteProfileStyles = StyleSheet.create({
container: {
Expand All @@ -15,10 +15,16 @@ const CompleteProfileStyles = StyleSheet.create({
},
textSubTitle: {
...fontHead18,
color: CustomTheme.primaryMedium,
color: CustomTheme.textPrimary,
marginTop: 12,
marginHorizontal: 24,
},
textDescription: {
...fontSub16,
color: CustomTheme.primaryMedium,
marginTop: 4,
marginHorizontal: 24,
},
iconLoading: {
alignItems: "center",
marginTop: 156,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/onboarding/ProfileLanguagePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const ProfileLanguagePage = () => {
);
}

// navigation.navigate("StudentVerification");
navigation.navigate("StudentVerification");
};

const { height: screenHeight } = Dimensions.get("window");
Expand Down
1 change: 1 addition & 0 deletions src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

"profileCompletionTitle": "Profile Creation Complete!",
"profileCompletionDescription": "Please wait a moment for student verification confirmation",
"averageVerificationTime": "It usually takes about 1 day to complete the verification.",

"connect": "Connect",
"newFriendText": "Join with new friends!",
Expand Down
1 change: 1 addition & 0 deletions src/translations/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

"profileCompletionTitle": "¡Creación de Perfil Completa!",
"profileCompletionDescription": "Por favor, espera un momento para la confirmación de la verificación de estudiante",
"averageVerificationTime": "La verificación suele tardar aproximadamente 1 día en completarse.",

"connect": "Conectar",
"newFriendText": "¡Con nuevos amigos!",
Expand Down
1 change: 1 addition & 0 deletions src/translations/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

"profileCompletionTitle": "プロフィール作成完了!",
"profileCompletionDescription": "学生認証確認までしばらくお待ちください",
"averageVerificationTime": "認証完了まで平均1日ほどかかります。",

"connect": "コネクト",
"newFriendText": "新しい友達と参加しよう!",
Expand Down
1 change: 1 addition & 0 deletions src/translations/ko.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

"profileCompletionTitle": "프로필 생성 완료!",
"profileCompletionDescription": "재학생 인증 확인까지 잠시만 기다려주세요",
"averageVerificationTime": "인증 완료까지 평균 1일 정도 걸려요.",

"connect": "커넥트",
"newFriendText": "새로운 친구와 함께해요!",
Expand Down
1 change: 1 addition & 0 deletions src/translations/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@

"profileCompletionTitle": "个人资料创建完成!",
"profileCompletionDescription": "请稍等片刻以确认学生认证",
"averageVerificationTime": "认证完成大约需要1天时间。",

"connect": "连接",
"newFriendText": "和新朋友一起加入吧!",
Expand Down
Loading