From 144cdfb79062b8fdade4640780ad13957548c6fb Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:02:52 +0900 Subject: [PATCH 01/28] =?UTF-8?q?index=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/index.tsx | 99 +++++++++++++++++++----------------- 1 file changed, 51 insertions(+), 48 deletions(-) diff --git a/app/(tabs)/records/index.tsx b/app/(tabs)/records/index.tsx index 2f14b37..c1052b9 100644 --- a/app/(tabs)/records/index.tsx +++ b/app/(tabs)/records/index.tsx @@ -1,63 +1,71 @@ -import { View, Text, StyleSheet, SafeAreaView } from "react-native"; +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; +import { useRouter } from 'expo-router'; +export default function RecordsIndex() { + const router = useRouter(); - -export default function RecordsScreen() { return ( - {/* Medical Record섹션 */} - + { + router.replace('/(tabs)/records/medicalRecordList'); + }} + > Medical Record - - Date of visit - 2024.11.24 - - - Visiting Hospital - Hanyang Hospital - - - Medical Subjects - sgdfgsdgfg - - - Symptoms - sgdfgsdgfg - - - Treatment Summary - asdfasdfasasdfasdfasdfasf - - + + Date of visit + 2024.11.24 + + + Visiting Hospital + Hanyang Hospital + + + Medical Subjects + sgdfgsdgfg + + + Symptoms + sgdfgsdgfg + + + Treatment Summary + asdfasdfasasdfasdfasdfasf + + - {/* Health Status 섹션 */} - + { + router.replace('/(tabs)/records/healthStatusRecordList'); + }} + > Health Status - - Disease - asdfasdfasd - - - Allergy - asdfasdfasd - - - Blood pressure - asdfasdfasd - + + Disease + asdfasdfasd + + + Allergy + asdfasdfasd + + + Blood pressure + asdfasdfasd + ); } -// 스타일 const styles = StyleSheet.create({ container: { backgroundColor: "#F5F9FC", marginTop:14, }, topSection: { - backgroundColor: "#E3F5F6", + backgroundColor: "#EEF6F9", borderRadius: 10, marginLeft:16, marginRight:16, @@ -68,7 +76,7 @@ const styles = StyleSheet.create({ marginBottom:20, }, bottomSection: { - backgroundColor: "#E3F5F6", + backgroundColor: "#EEF6F9", borderRadius: 12, marginLeft:16, marginRight:16, @@ -77,10 +85,6 @@ const styles = StyleSheet.create({ shadowOffset: { width: 0, height: 4 }, shadowRadius: 4, }, - inner: { - backgroundColor: "#FFFFFF", - margin:0, - }, sectionTitle: { marginTop:13, paddingLeft:16, @@ -150,4 +154,3 @@ const styles = StyleSheet.create({ marginRight:16, }, }); - From 42e649fe4aadbf5c4820b90c95e2e73d7dfd03d0 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:04:38 +0900 Subject: [PATCH 02/28] Add files via upload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 기록페이지 UI 구현 --- app/(tabs)/records/healthStatusRecordList.tsx | 143 +++++ .../records/healthStatusRecordListEdit1.tsx | 567 ++++++++++++++++++ .../records/healthStatusRecordListFull1.tsx | 128 ++++ app/(tabs)/records/medicalRecordList.tsx | 147 +++++ app/(tabs)/records/medicalRecordListEdit1.tsx | 344 +++++++++++ app/(tabs)/records/medicalRecordListFull1.tsx | 124 ++++ 6 files changed, 1453 insertions(+) create mode 100644 app/(tabs)/records/healthStatusRecordList.tsx create mode 100644 app/(tabs)/records/healthStatusRecordListEdit1.tsx create mode 100644 app/(tabs)/records/healthStatusRecordListFull1.tsx create mode 100644 app/(tabs)/records/medicalRecordList.tsx create mode 100644 app/(tabs)/records/medicalRecordListEdit1.tsx create mode 100644 app/(tabs)/records/medicalRecordListFull1.tsx diff --git a/app/(tabs)/records/healthStatusRecordList.tsx b/app/(tabs)/records/healthStatusRecordList.tsx new file mode 100644 index 0000000..b6a15bf --- /dev/null +++ b/app/(tabs)/records/healthStatusRecordList.tsx @@ -0,0 +1,143 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from 'react-native'; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; + +export default function MedicalRecordList() { + const router = useRouter(); + + const diease = [ + 'diabetes,colic1', + 'diabetes,colic2', + 'diabetes,colic3', + 'diabetes,colic4', + 'diabetes,colic5', + ]; + + const handleNavigate = (dieaseName) => { + if (dieaseName === diease[0]) { + router.push('/(tabs)/records/healthStatusRecordListFull1'); + } else if (dieaseName === diease[1]) { + router.push('/(tabs)/records/healthStatusRecordListFull2'); + } else if (dieaseName === diease[2]) { + router.push('/(tabs)/records/healthStatusRecordListFull3'); + } else if (dieaseName === diease[3]) { + router.push('/(tabs)/records/healthStatusRecordListFull4'); + } else if (dieaseName === diease[4]) { + router.push('/(tabs)/records/healthStatusRecordListFull5'); + } + }; + + const handleNewPress = () => { + router.push('/(tabs)/records/healthStatusRecordListEdit1'); + }; + + return ( + + + router.replace('/(tabs)/records')} + style={styles.backButton} + > + + + Health Record + + + {diease.map((dieaseItem, index) => ( + + + 2024.11.20 {/* 임시 날짜 */} + + + handleNavigate(dieaseItem)} + style={styles.listItem} + > + {dieaseItem} + + + + + ))} + + + + New + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#F5F9FC", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + left: 0, + right: 0, + }, + date: { + marginTop: 24, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#767676", + fontSize: 14, + fontWeight: 400, + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + }, + listItem: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + }, + listText: { + color: "#000", + fontSize: 16, + fontWeight: 400, + }, + fabButton: { + position: 'absolute', + bottom: 40, + right: 20, + backgroundColor: '#0097A7', + borderRadius: 24, + paddingHorizontal: 16, + paddingVertical: 12, + shadowColor: '#000', + shadowOpacity: 0.15, + shadowOffset: { width: 0, height: 3 }, + shadowRadius: 3, + elevation: 3, + }, + fabText: { + color: '#FFFFFF', + fontSize: 16, + fontWeight: '600', + }, +}); diff --git a/app/(tabs)/records/healthStatusRecordListEdit1.tsx b/app/(tabs)/records/healthStatusRecordListEdit1.tsx new file mode 100644 index 0000000..1088883 --- /dev/null +++ b/app/(tabs)/records/healthStatusRecordListEdit1.tsx @@ -0,0 +1,567 @@ +import { + View, + Text, + StyleSheet, + SafeAreaView, + TouchableOpacity, + TextInput, + KeyboardAvoidingView, + ScrollView, + Platform, + TouchableWithoutFeedback, + Keyboard +} from "react-native"; +import { useRouter } from "expo-router"; +import { Ionicons } from "@expo/vector-icons"; +import { useState, useRef } from "react"; + +export default function HealthStatusRecordListEdit1() { + const router = useRouter(); + const [bloodPressure, setBloodPressure] = useState(""); + const [bloodSugar, setBloodSugar] = useState(""); + const [fasting, setFasting] = useState(""); + const [postprandial, setPostprandial] = useState(""); + const [contraction, setContraction] = useState(""); + const [relaxation, setRelaxation] = useState(""); + const [focusedInput, setFocusedInput] = useState(null); + const [isEditingBloodPressure, setIsEditingBloodPressure] = useState(false); + const [isEditingBloodSugar, setIsEditingBloodSugar] = useState(false); + const [savedBloodPressure, setSavedBloodPressure] = useState(""); + const [savedBloodSugar, setSavedBloodSugar] = useState(""); + + const contractionInputRef = useRef(null); + const relaxationInputRef = useRef(null); + const fastingInputRef = useRef(null); + const postprandialInputRef = useRef(null); + const [medicineHistoryList, setMedicineHistoryList] = useState([""]); + const [isEditingMedicineHistory, setIsEditingMedicineHistory] = useState(false); + + + + const handleSaveBloodPressure = () => { + const formattedBloodPressure = `${contraction || "-"} / ${relaxation || "-"}`; + setBloodPressure(formattedBloodPressure); + setSavedBloodPressure(formattedBloodPressure); + setIsEditingBloodPressure(false); + }; + + + const handleSaveBloodSugar = () => { + const formattedBloodSugar = `${fasting || "-"} / ${postprandial || "-"}`; + setBloodSugar(formattedBloodSugar); + setSavedBloodSugar(formattedBloodSugar); + setIsEditingBloodSugar(false); + }; + + + + const handleCloseEditing = () => { + setIsEditingBloodPressure(false); + setIsEditingBloodSugar(false); + setIsEditingMedicineHistory(false); + }; + + +const handleAddMedicineHistory = () => { + const updatedList = [...medicineHistoryList]; + + + if (updatedList[0] !== "") { + updatedList.unshift(updatedList[0]); + updatedList[0] = ""; + } + setMedicineHistoryList(updatedList); +}; + +const handleRemoveMedicineHistory = (index: number) => { + const updatedList = [...medicineHistoryList]; + updatedList.splice(index, 1); + setMedicineHistoryList(updatedList); +}; + + +const handleChangeMedicineHistory = (text: string, index: number) => { + const updatedList = [...medicineHistoryList]; + updatedList[index] = text; + setMedicineHistoryList(updatedList); +}; + + return ( + + + + + + router.push("/(tabs)/records/healthStatusRecordList")} + style={styles.backButton} + > + + + Health Status + + + + + Disease + + setFocusedInput("disease")} + onBlur={() => setFocusedInput(null)} + /> + + + + + + Allergy + + setFocusedInput("allergy")} + onBlur={() => setFocusedInput(null)} + /> + + + + + + Blood Pressure + + { + setIsEditingBloodPressure(true); + setFocusedInput("bloodPressure"); + }} + style={styles.bloodPressureWrapper} + > + + {bloodPressure !== "" && mmHg} + + + + {isEditingBloodPressure && ( + + Blood Pressure + + { + contractionInputRef.current?.focus(); + }} + > + Contraction + {contraction} + + { + relaxationInputRef.current?.focus(); + }} + > + Relaxation + {relaxation} + + + + mmHg + + )} + + + + Blood Sugar + + { + setIsEditingBloodSugar(true); + setFocusedInput("bloodSugar"); + }} + style={styles.bloodPressureWrapper} + > + + {bloodSugar !== "" && mg/dL} + + + + {isEditingBloodSugar && ( + + Blood Sugar + + + { + fastingInputRef.current?.focus(); + }} + > + Fasting + {fasting} + + + {/* Postprandial */} + { + postprandialInputRef.current?.focus(); + }} + > + Postprandial + {postprandial} + + + + mg/dL + + )} + + + Medicine History + + setIsEditingMedicineHistory(true)} + style={styles.inputField} + > + 1 && medicineHistoryList[1] ? "#000" : "#A0A0A0" }}> + {medicineHistoryList.length > 1 && medicineHistoryList[1] ? medicineHistoryList[1] : "Enter second medicine history"} + + + + +{isEditingMedicineHistory && ( + + Medicine History + + {medicineHistoryList.map((medicine, index) => ( + + handleChangeMedicineHistory(text, index)} + placeholder="Medication / Type of medication / Date taken" + placeholderTextColor="#767676" + editable={index === 0} + /> + {index === 0 && ( + + + + )} + {index !== 0 && ( + handleRemoveMedicineHistory(index)} style={styles.commonButton}> + + + )} + + ))} + +)} + + setFocusedInput("contraction")} + onBlur={() => setFocusedInput(null)} + /> + setFocusedInput("relaxation")} + onBlur={() => setFocusedInput(null)} + /> + setFocusedInput("fasting")} + onBlur={() => setFocusedInput(null)} + /> + setFocusedInput("postprandial")} + onBlur={() => setFocusedInput(null)} + /> + + + {isEditingBloodPressure && ( + + + Save + + + )} + + {/* Save 버튼 (혈당) */} + {isEditingBloodSugar && ( + + + Save + + + )} + + + {!isEditingBloodPressure && !isEditingBloodSugar && ( + + + Submit + + + )} + + + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + paddingBottom: 20, + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + fontSize: 20, + fontWeight: "500", + flex: 1, + color: "#000", + textAlign: "center", + }, + inputContainer: { + marginTop: 24, + marginHorizontal: 24, + }, + inputLabel: { + color: "#434343", + fontSize: 14, + fontWeight: "400", + marginBottom: 8, + }, + inputField: { + paddingVertical: 14, + paddingHorizontal: 16, + borderRadius: 10, + backgroundColor: "#FFF", + fontSize: 18, + fontWeight: "400", + color: "#000", + borderBottomWidth: 1, + borderBottomColor: "#F5F5F5", + }, + focusedTitle: { + color: "#0097A7", + }, + focusedInput: { + borderBottomColor: "#0097A7", + borderBottomWidth: 2, + }, + + bloodPressureContainer: { + marginTop: -250, + paddingHorizontal: 24, + backgroundColor:"#F5F9Fc", + height:700, + borderTopLeftRadius:24, + borderTopRightRadius:24, + }, + bloodPressureTitle:{ + fontSize: 18, + color: "#000", + marginBottom: 16, + marginTop:38, + }, + bloodPressureRow: { + flexDirection: "row", + justifyContent: "space-between", + gap: 10, + }, + bloodPressureBox: { + flex: 1, + backgroundColor: "#FFF", + borderRadius: 10, + paddingVertical: 12, + justifyContent: "center", + alignItems: "center", + height:170, + width:170, + }, + bloodPressureText: { + color: "#434343", + fontSize: 14, + position:"absolute", + top:16, + }, + bloodPressureWrapper: { + flexDirection: "row", + alignItems: "center", + }, + valueText: { + fontSize: 32, + color: "#000", + marginTop:10, + }, + mmhgBottom: { + textAlign: "right", + color: "#000", + marginTop: 15, + fontSize: 16, + }, + mmhgText: { + fontSize: 12, + color: "#000", + }, + hiddenInput: { + position: "absolute", + top: -9999, + }, + + buttonContainer: { + flexDirection: "column", + paddingHorizontal: 24, + marginTop: 24, + }, + saveButton1: { + position: "absolute", + backgroundColor: "#0097A7", + left: 30, + bottom: 450, + paddingHorizontal: 150, + paddingVertical: 15, + borderRadius: 10, + justifyContent: "center", + alignItems: "center", + }, + saveButton2: { + position: "absolute", + backgroundColor: "#0097A7", + left: 30, + bottom: 350, + paddingHorizontal: 150, + paddingVertical: 15, + borderRadius: 10, + justifyContent: "center", + alignItems: "center", + }, + submitButton: { + backgroundColor: "#0097A7", + paddingVertical: 14, + borderRadius: 10, + justifyContent: "center", + alignItems: "center", + marginTop:50, + }, + submitText: { + color: "#fff", + fontSize: 16, + fontWeight: "500", + }, + mmHgText:{ + fontSize:12, + marginRight:15, + }, + bloodSugarContainer: { + marginTop: -350, + paddingHorizontal: 24, + backgroundColor: "#F5F9Fc", + height: 700, + borderTopLeftRadius: 24, + borderTopRightRadius: 24, + }, + medicineHistoryContainer: { + marginTop: -450, + paddingHorizontal: 24, + backgroundColor: "#F5F9Fc", + height: 700, + borderTopLeftRadius: 24, + borderTopRightRadius: 24, + }, + medicineHistoryRow: { + flexDirection: "row", + alignItems: "center", + marginBottom: 10, + width:330, + marginLeft:6, + }, + medicineInputField: { + flex: 1, + paddingVertical: 14, + paddingHorizontal: 16, + borderRadius: 10, + backgroundColor: "#FFF", + fontSize: 12, + fontWeight: "400", + color: "#000", + borderWidth: 1, + borderColor: "#E5E5EC", + }, + + commonButton: { + position:"absolute", + flexDirection: "row", + alignItems: "center", + marginTop: 0, + right:15, + }, + addButtonText: { + marginLeft: 5, + fontSize: 13, + }, + +}); \ No newline at end of file diff --git a/app/(tabs)/records/healthStatusRecordListFull1.tsx b/app/(tabs)/records/healthStatusRecordListFull1.tsx new file mode 100644 index 0000000..ee8331f --- /dev/null +++ b/app/(tabs)/records/healthStatusRecordListFull1.tsx @@ -0,0 +1,128 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; +import EditIcon from "@/assets/icons/EditIcon"; + +export default function MedicalRecordListEdit1() { + const router = useRouter(); + + const handleEditIconPress = () => { + }; + + return( + + + router.push('/(tabs)/records/healthStatusRecordList')} style={styles.backButton}> + + + Health Status + + + + + + + + Disease + + + + diabetes, colic + + + + Allergy + + + + pollen, sellfish, peach + + + + Blood pressure + + + + 138 / 75 mmHg + + + + Blood sugar + + + + 90 / 164 mg/dL + + + + Medicine History + + + + dermatological + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + }, + editIconWrapper: { + position: 'absolute', + right: 24, + top: 0, + }, + editIcon: { + }, + date: { + marginTop: 32, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#434343", + fontSize: 14, + fontWeight: 400, + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + borderBottomColor: "#F5F5F5", + borderBottomWidth: 1, + }, + listText: { + color: "#000", + fontSize: 18, + fontWeight: 400, + }, + smallText:{ + fontSize:12, + }, +}); diff --git a/app/(tabs)/records/medicalRecordList.tsx b/app/(tabs)/records/medicalRecordList.tsx new file mode 100644 index 0000000..9949174 --- /dev/null +++ b/app/(tabs)/records/medicalRecordList.tsx @@ -0,0 +1,147 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from 'react-native'; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; +import { Label } from "@/shared/components/label/Label"; + +export default function MedicalRecordList() { + const router = useRouter(); + const hospitals = [ + 'Hanyang Hospital', + 'Seoul Hospital', + 'Busan Hospital', + 'Incheon Hospital', + 'Daegu Hospital' + ]; + + const handleNavigate = (hospitalName) => { + if (hospitalName === hospitals[0]) { + router.push('/(tabs)/records/medicalRecordListFull1'); + } else if (hospitalName === hospitals[1]) { + router.push('/(tabs)/records/medicalRecordListFull2'); + } else if (hospitalName === hospitals[2]) { + router.push('/(tabs)/records/medicalRecordListFull3'); + } else if (hospitalName === hospitals[3]) { + router.push('/(tabs)/records/medicalRecordListFull4'); + } else if (hospitalName === hospitals[4]) { + router.push('/(tabs)/records/medicalRecordListFull5'); + } + }; + + const handleNewPress = () => { + router.push('/(tabs)/records/medicalRecordListEdit1'); + }; + + return ( + + + router.replace('/(tabs)/records')} + style={styles.backButton} + > + + + + + + {hospitals.map((hospital, index) => ( + + + + + + handleNavigate(hospital)} + style={styles.listItem} + > + + + + + + ))} + + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#F5F9FC", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + left: 0, + right: 0, + fontFamily:"Pretendard", + }, + date: { + marginTop: 24, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#767676", + fontSize: 14, + fontWeight: 400, + fontFamily:"Pretendard", + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + }, + listItem: { + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + }, + listText: { + color: "#000", + fontSize: 16, + fontWeight: 400, + fontFamily:"Pretendard", + }, + fabButton: { + position: 'absolute', + bottom: 40, + right: 20, + backgroundColor: '#0097A7', + borderRadius: 24, + paddingHorizontal: 16, + paddingVertical: 12, + shadowColor: '#000', + shadowOpacity: 0.15, + shadowOffset: { width: 0, height: 3 }, + shadowRadius: 3, + elevation: 3, + }, + fabText: { + color: '#FFFFFF', + fontSize: 16, + fontWeight: '600', + fontFamily:"Pretendard", + }, +}); diff --git a/app/(tabs)/records/medicalRecordListEdit1.tsx b/app/(tabs)/records/medicalRecordListEdit1.tsx new file mode 100644 index 0000000..e715c8c --- /dev/null +++ b/app/(tabs)/records/medicalRecordListEdit1.tsx @@ -0,0 +1,344 @@ +import React, { useState, useEffect } from "react"; +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity, TextInput, ScrollView, KeyboardAvoidingView, Platform, TouchableWithoutFeedback, Keyboard } from "react-native"; +import { useRouter } from "expo-router"; +import { Ionicons } from "@expo/vector-icons"; +import { Picker } from "@react-native-picker/picker"; + +export default function MedicalRecordListEdit1() { + const router = useRouter(); + const [focusedInput, setFocusedInput] = useState(null); + const [date, setDate] = useState<{ year: string | null, month: string | null, day: string | null }>({ + year: null, + month: null, + day: null, + }); + const [isDatePickerVisible, setDatePickerVisibility] = useState(false); + const [formattedDate, setFormattedDate] = useState(""); + + useEffect(() => { + const currentDate = new Date(); + const currentYear = currentDate.getFullYear().toString(); + const currentMonth = (currentDate.getMonth() + 1).toString().padStart(2, "0"); + const currentDay = currentDate.getDate().toString().padStart(2, "0"); + + setDate({ + year: currentYear.slice(2), + month: currentMonth, + day: currentDay, + }); + }, []); + + const handleDateChange = (value: string, type: string) => { + setDate((prevDate) => ({ + ...prevDate, + [type]: value, + })); + }; + + + useEffect(() => { + if (date.year && date.month && date.day) { + const fullYear = parseInt(date.year, 10) >= 75 && parseInt(date.year, 10) <= 99 + ? `19${date.year}` + : parseInt(date.year, 10) >= 0 && parseInt(date.year, 10) <= 40 + ? `20${date.year}` + : `20${date.year}`; + setFormattedDate(`${fullYear}.${date.month}.${date.day}`); + } + }, [date]); + + + const handleOutsidePress = () => { + setDatePickerVisibility(false); + Keyboard.dismiss(); + }; + + + const handleSaveDate = () => { + setDatePickerVisibility(false); + const fullYear = parseInt(date.year, 10) >= 75 && parseInt(date.year, 10) <= 99 + ? `19${date.year}` + : parseInt(date.year, 10) >= 0 && parseInt(date.year, 10) <= 40 + ? `20${date.year}` + : `20${date.year}`; + setFormattedDate(`${fullYear}.${date.month}.${date.day}`); + }; + + const handleSubmit = () => { + console.log("Form submitted"); + }; + + return ( + + + + + + router.push("/(tabs)/records/medicalRecordList")} + style={styles.backButton} + > + + + Medical Record + + + + + + Date of visit + + + setDatePickerVisibility(true)} + > + {formattedDate || "Select a date"} + + + + Visiting Hospital + + + + setFocusedInput("hospital")} + onBlur={() => setFocusedInput(null)} + /> + + + + + Medical Subjects + + + + setFocusedInput("subjects")} + onBlur={() => setFocusedInput(null)} + /> + + + + + Symptoms + + + + setFocusedInput("symptoms")} + onBlur={() => setFocusedInput(null)} + /> + + + + + Treatment Summary + + + + setFocusedInput("summary")} + onBlur={() => setFocusedInput(null)} + /> + + + + + + {isDatePickerVisible && ( + + + Date of visit + + + + YY + handleDateChange(itemValue, "year")} + > + {[...Array(66).keys()].map((i) => { + const year = (1975 + i).toString().slice(2); + return ; + })} + + + + MM + handleDateChange(itemValue, "month")} + > + {[...Array(12).keys()].map((i) => { + const month = (i + 1).toString().padStart(2, "0"); + return ; + })} + + + + + DD + handleDateChange(itemValue, "day")} + > + {[...Array(31).keys()].map((i) => { + const day = (i + 1).toString().padStart(2, "0"); + return ; + })} + + + + + + Save + + + )} + + + Submit + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + fontSize: 20, + fontWeight: "500", + flex: 1, + color: "#000", + textAlign: "center", + }, + date: { + marginTop: 32, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#434343", + fontSize: 14, + fontWeight: "400", + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + borderBottomColor: "#F5F5F5", + borderBottomWidth: 1, + }, + listText: { + color: "#000", + fontSize: 18, + fontWeight: "400", + }, + focusedTitle: { + color: "#0097A7", + }, + focusedList: { + borderBottomColor: "#0097A7", + borderBottomWidth: 1, + }, + pickerContainer: { + backgroundColor: "#F5F9FC", + position: "absolute", + bottom: 0, + left: 0, + right: 0, + paddingBottom: 97, + paddingTop: 48, + zIndex: 1000, + borderTopLeftRadius: 24, + borderTopRightRadius: 24, + }, + + pickerHeader: { + position: "absolute", + left: 24, + top: 30, + zIndex: 1, + }, + dateOfVisitTitle:{ + fontSize:18, + fontWeight:400, + }, + pickerScroll: { + flexDirection: "row", + justifyContent: "center", + alignItems: "center", + justifyContent: "space-evenly", + flex: 1, + }, + pickerWrapper: { + alignItems: "center", + justifyContent: "center", + marginHorizontal: -100, + height: 200, + }, + pickerLabel: { + fontSize: 12, + fontWeight: "400", + color: "#000", + marginBottom: 5, + backgroundColor:"#FFFFFF" + }, + picker: { + height: 130, + width: 90, + }, + saveButton: { + backgroundColor: "#0097A7", + paddingVertical: 12, + marginHorizontal: 24, + marginTop: 20, + marginBottom:-70, + borderRadius: 10, + alignItems: "center", + }, + saveButtonText: { + color: "#fff", + fontSize: 16, + fontWeight: "600", + }, + submitButton: { + backgroundColor: "#0097A7", + paddingVertical: 12, + marginHorizontal: 24, + marginTop: 20, + marginBottom:20, + borderRadius: 10, + alignItems: "center", + }, +}); diff --git a/app/(tabs)/records/medicalRecordListFull1.tsx b/app/(tabs)/records/medicalRecordListFull1.tsx new file mode 100644 index 0000000..fec8612 --- /dev/null +++ b/app/(tabs)/records/medicalRecordListFull1.tsx @@ -0,0 +1,124 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; +import EditIcon from "@/assets/icons/EditIcon"; + +export default function MedicalRecordListEdit1() { + const router = useRouter(); + + const handleEditIconPress = () => { + }; + + return( + + + router.push('/(tabs)/records/medicalRecordList')} style={styles.backButton}> + + + Medical Record + + + + + + + Date of visit + + + + 2024.11.24 + + + + Visiting Hospital + + + + Hanyang Hospital + + + + Medical Subjects + + + + Hanyang Hospital + + + + Symptoms + + + + Hanyang Hospital + + + + Treatment Summary + + + + Hanyang Hospital + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + }, + editIconWrapper: { + position: 'absolute', + right: 24, + top: 0, + }, + editIcon: { + }, + date: { + marginTop: 32, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#434343", + fontSize: 14, + fontWeight: 400, + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + borderBottomColor: "#F5F5F5", + borderBottomWidth: 1, + }, + listText: { + color: "#000", + fontSize: 18, + fontWeight: 400, + }, +}); From a5a2cd6009e0b4d778e46f0ba5c4a8bfafdbdb44 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:07:03 +0900 Subject: [PATCH 03/28] Editicon --- assets/icons/EditIcon.tsx | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 assets/icons/EditIcon.tsx diff --git a/assets/icons/EditIcon.tsx b/assets/icons/EditIcon.tsx new file mode 100644 index 0000000..93a775a --- /dev/null +++ b/assets/icons/EditIcon.tsx @@ -0,0 +1,24 @@ +import * as React from "react"; +import Svg, { G, Path, Defs, ClipPath, Rect } from "react-native-svg"; + +const EditIcon = (props) => ( + + + + + + + + + + + +); + +export default EditIcon; From b0cdaafd6a35c1f168d05381054edd7dc78d9e6e Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:07:54 +0900 Subject: [PATCH 04/28] Update healthStatusRecordList.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit healthstatus초기화면ui구현 From e8820f7d4c334f8b99ae6013e381b4c317457f57 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 1 Mar 2025 02:08:27 +0900 Subject: [PATCH 05/28] Update healthStatusRecordList.tsx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit healthstatus페이지 ui구현 From d62ede7d0029a966714a894cd58176c2c9408340 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Sat, 15 Mar 2025 11:23:35 +0900 Subject: [PATCH 06/28] =?UTF-8?q?save=EB=B2=84=ED=8A=BC=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/healthStatusRecordListEdit1.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/(tabs)/records/healthStatusRecordListEdit1.tsx b/app/(tabs)/records/healthStatusRecordListEdit1.tsx index 1088883..f8adceb 100644 --- a/app/(tabs)/records/healthStatusRecordListEdit1.tsx +++ b/app/(tabs)/records/healthStatusRecordListEdit1.tsx @@ -481,7 +481,7 @@ const styles = StyleSheet.create({ position: "absolute", backgroundColor: "#0097A7", left: 30, - bottom: 450, + bottom: 530, paddingHorizontal: 150, paddingVertical: 15, borderRadius: 10, @@ -492,7 +492,7 @@ const styles = StyleSheet.create({ position: "absolute", backgroundColor: "#0097A7", left: 30, - bottom: 350, + bottom: 430, paddingHorizontal: 150, paddingVertical: 15, borderRadius: 10, @@ -564,4 +564,4 @@ const styles = StyleSheet.create({ fontSize: 13, }, -}); \ No newline at end of file +}); From d193f517fa872eb99dac4811b96ef19143a4e858 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 20:35:42 +0900 Subject: [PATCH 07/28] =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8?= =?UTF-8?q?=EB=A1=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/index.tsx | 101 +++-------------------------------- 1 file changed, 6 insertions(+), 95 deletions(-) diff --git a/app/(tabs)/records/index.tsx b/app/(tabs)/records/index.tsx index c1052b9..ff6536c 100644 --- a/app/(tabs)/records/index.tsx +++ b/app/(tabs)/records/index.tsx @@ -1,9 +1,11 @@ +// 들어가자 마자 보이는 화면 import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; import { useRouter } from 'expo-router'; +import MedicalRecordDetails from "@/features/auth/services/records/medicalRecordDetails"; +import HealthStatusDetails from "@/features/auth/services/records/healthStatusDetails"; export default function RecordsIndex() { const router = useRouter(); - return ( Medical Record - - Date of visit - 2024.11.24 - - - Visiting Hospital - Hanyang Hospital - - - Medical Subjects - sgdfgsdgfg - - - Symptoms - sgdfgsdgfg - - - Treatment Summary - asdfasdfasasdfasdfasdfasf - + Health Status - - Disease - asdfasdfasd - - - Allergy - asdfasdfasd - - - Blood pressure - asdfasdfasd - + ); } - +// 요까지 const styles = StyleSheet.create({ container: { backgroundColor: "#F5F9FC", @@ -92,65 +64,4 @@ const styles = StyleSheet.create({ fontWeight: "bold", marginBottom: 12, }, - recordItemTop: { - backgroundColor:"#FFFFFF", - paddingLeft:16, - justifyContent: "space-between", - paddingVertical: 6, - borderBottomWidth: 1, - borderBottomColor: "#E5E7EB", - }, - recordItemBottom: { - backgroundColor:"#FFFFFF", - flexDirection: "row", - justifyContent: "space-between", - paddingVertical: 6, - borderBottomColor: "#E5E7EB", - }, - cornerRadiusTop: { - backgroundColor:"#FFFFFF", - paddingLeft:16, - justifyContent: "space-between", - paddingVertical: 6, - borderBottomWidth: 1, - borderBottomColor: "#E5E7EB", - borderBottomLeftRadius: 10, - borderBottomRightRadius: 10, - }, - cornerRadiusBotttom: { - backgroundColor:"#FFFFFF", - flexDirection: "row", - justifyContent: "space-between", - paddingVertical: 6, - borderBottomColor: "#E5E7EB", - borderBottomLeftRadius: 10, - borderBottomRightRadius: 10, - }, - labelTop: { - fontSize: 16, - fontWeight: "400", - color: "#000", - marginBottom:4, - marginTop:9, - }, - valueTop: { - fontSize: 14, - color: "#656565", - fontWeight: "400", - marginBottom: 9, - }, - labelBottom: { - fontSize: 16, - fontWeight: "400", - color: "#000", - marginVertical: 9, - marginLeft:16, - }, - valueBottom: { - fontSize: 14, - color: "#656565", - fontWeight: "400", - marginVertical: 9, - marginRight:16, - }, }); From 43b30f1242f7babc996deeb09de8b730cab74478 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 20:36:27 +0900 Subject: [PATCH 08/28] =?UTF-8?q?docs=20:=20healthStatus=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/healthStatusDetails.tsx | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 features/auth/services/records/healthStatusDetails.tsx diff --git a/features/auth/services/records/healthStatusDetails.tsx b/features/auth/services/records/healthStatusDetails.tsx new file mode 100644 index 0000000..af7fba3 --- /dev/null +++ b/features/auth/services/records/healthStatusDetails.tsx @@ -0,0 +1,55 @@ +// 초기 기록화면 health Status컴포넌트화 + +import React from 'react'; +import { View, Text, StyleSheet } from 'react-native'; + +export default function HealthStatusDetails() { + return ( + + + Disease + asdfasdfasd + + + Allergy + asdfasdfasd + + + Blood pressure + asdfasdfasd + + + ); +} +const styles = StyleSheet.create({ + recordItemBottom: { + backgroundColor:"#FFFFFF", + flexDirection: "row", + justifyContent: "space-between", + paddingVertical: 6, + borderBottomColor: "#E5E7EB", + }, + cornerRadiusBotttom: { + backgroundColor:"#FFFFFF", + flexDirection: "row", + justifyContent: "space-between", + paddingVertical: 6, + borderBottomColor: "#E5E7EB", + borderBottomLeftRadius: 10, + borderBottomRightRadius: 10, + }, + labelBottom: { + fontSize: 16, + fontWeight: "400", + color: "#000", + marginVertical: 9, + marginLeft:16, + }, + valueBottom: { + fontSize: 14, + color: "#656565", + fontWeight: "400", + marginVertical: 9, + marginRight:16, + }, +}); \ No newline at end of file From f947389c8abed7bc67e4f4a28a7b2574778b0424 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 20:36:48 +0900 Subject: [PATCH 09/28] =?UTF-8?q?docs=20:=20medicalRecord=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/medicalRecordDetails.tsx | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 features/auth/services/records/medicalRecordDetails.tsx diff --git a/features/auth/services/records/medicalRecordDetails.tsx b/features/auth/services/records/medicalRecordDetails.tsx new file mode 100644 index 0000000..e3dd06e --- /dev/null +++ b/features/auth/services/records/medicalRecordDetails.tsx @@ -0,0 +1,64 @@ +// 초기 기록화면 Medical Record컴포넌트화 + +import React from 'react'; +import { View, Text, StyleSheet } from 'react-native'; + +export default function MedicalRecordDetails() { + return ( + + + Date of visit + 2024.11.24 + + + Visiting Hospital + Hanyang Hospital + + + Medical Subjects + sgdfgsdgfg + + + Symptoms + sgdfgsdgfg + + + Treatment Summary + asdfasdfasasdfasdfasdfasf + + + ); +} +const styles = StyleSheet.create({ + recordItemTop: { + backgroundColor:"#FFFFFF", + paddingLeft:16, + justifyContent: "space-between", + paddingVertical: 6, + borderBottomWidth: 1, + borderBottomColor: "#E5E7EB", + }, + labelTop: { + fontSize: 16, + fontWeight: "400", + color: "#000", + marginBottom:4, + marginTop:9, + }, + valueTop: { + fontSize: 14, + color: "#656565", + fontWeight: "400", + marginBottom: 9, + }, + cornerRadiusTop: { + backgroundColor:"#FFFFFF", + paddingLeft:16, + justifyContent: "space-between", + paddingVertical: 6, + borderBottomWidth: 1, + borderBottomColor: "#E5E7EB", + borderBottomLeftRadius: 10, + borderBottomRightRadius: 10, + }, +}); \ No newline at end of file From 7134d48d9f04eee15fb6ec7ebe4ab6b8451e10b5 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:31:42 +0900 Subject: [PATCH 10/28] =?UTF-8?q?docs=20:=20disease=20Data=20=EC=83=81?= =?UTF-8?q?=EC=88=98=EA=B0=92=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/auth/services/records/consts/diseaseData.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 features/auth/services/records/consts/diseaseData.js diff --git a/features/auth/services/records/consts/diseaseData.js b/features/auth/services/records/consts/diseaseData.js new file mode 100644 index 0000000..e100b8b --- /dev/null +++ b/features/auth/services/records/consts/diseaseData.js @@ -0,0 +1,8 @@ +//dieaseData +export const disease = [ + 'diabetes,colic1', + 'diabetes,colic2', + 'diabetes,colic3', + 'diabetes,colic4', + 'diabetes,colic5', + ]; \ No newline at end of file From d2b4ee9e443b1a781e5feb4b8a617cb3d636b698 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:32:08 +0900 Subject: [PATCH 11/28] =?UTF-8?q?docs=20:=20healthstatus=20=EC=83=81?= =?UTF-8?q?=EC=88=98=EA=B0=92=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/healthStatusRecordList.tsx | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/app/(tabs)/records/healthStatusRecordList.tsx b/app/(tabs)/records/healthStatusRecordList.tsx index b6a15bf..42fd294 100644 --- a/app/(tabs)/records/healthStatusRecordList.tsx +++ b/app/(tabs)/records/healthStatusRecordList.tsx @@ -1,30 +1,15 @@ import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from 'react-native'; import { useRouter } from 'expo-router'; import { Ionicons } from '@expo/vector-icons'; +import { disease } from '@/features/auth/services/records/consts/diseaseData'; // disease import export default function MedicalRecordList() { const router = useRouter(); - const diease = [ - 'diabetes,colic1', - 'diabetes,colic2', - 'diabetes,colic3', - 'diabetes,colic4', - 'diabetes,colic5', - ]; - - const handleNavigate = (dieaseName) => { - if (dieaseName === diease[0]) { - router.push('/(tabs)/records/healthStatusRecordListFull1'); - } else if (dieaseName === diease[1]) { - router.push('/(tabs)/records/healthStatusRecordListFull2'); - } else if (dieaseName === diease[2]) { - router.push('/(tabs)/records/healthStatusRecordListFull3'); - } else if (dieaseName === diease[3]) { - router.push('/(tabs)/records/healthStatusRecordListFull4'); - } else if (dieaseName === diease[4]) { - router.push('/(tabs)/records/healthStatusRecordListFull5'); - } + const handleNavigate = (diseaseName) => { + if (diseaseName === disease[0]) { + router.push('/(tabs)/records/healthStatusRecord'); + } // API 연동 후 나머지 부분 처리 }; const handleNewPress = () => { @@ -43,17 +28,17 @@ export default function MedicalRecordList() { Health Record - {diease.map((dieaseItem, index) => ( + {disease.map((diseaseItem, index) => ( 2024.11.20 {/* 임시 날짜 */} handleNavigate(dieaseItem)} + onPress={() => handleNavigate(diseaseItem)} style={styles.listItem} > - {dieaseItem} + {diseaseItem} From e4407bca9026decb9e955c976d8fd5a3a9ea0480 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:44:24 +0900 Subject: [PATCH 12/28] =?UTF-8?q?docs=20:=20hospitalData=20=EC=83=81?= =?UTF-8?q?=EC=88=98=EA=B0=92=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/auth/services/records/consts/hospitalData.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 features/auth/services/records/consts/hospitalData.js diff --git a/features/auth/services/records/consts/hospitalData.js b/features/auth/services/records/consts/hospitalData.js new file mode 100644 index 0000000..e3b07c9 --- /dev/null +++ b/features/auth/services/records/consts/hospitalData.js @@ -0,0 +1,8 @@ +// hospitalData +export const hospitals = [ + 'Hanyang Hospital', + 'Seoul Hospital', + 'Busan Hospital', + 'Incheon Hospital', + 'Daegu Hospital' + ]; \ No newline at end of file From 0614b1a6b189a8e90ba48b8d0a9fda52f9fd3b11 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:45:38 +0900 Subject: [PATCH 13/28] =?UTF-8?q?docs=20:=20medicalRecordList=20=EC=83=81?= =?UTF-8?q?=EC=88=98=EA=B0=92=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/medicalRecordList.tsx | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/app/(tabs)/records/medicalRecordList.tsx b/app/(tabs)/records/medicalRecordList.tsx index 9949174..df27d5a 100644 --- a/app/(tabs)/records/medicalRecordList.tsx +++ b/app/(tabs)/records/medicalRecordList.tsx @@ -2,33 +2,19 @@ import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from 'react-na import { useRouter } from 'expo-router'; import { Ionicons } from '@expo/vector-icons'; import { Label } from "@/shared/components/label/Label"; +import { hospitals } from '@/features/auth/services/records/consts/hospitalData'; // hospital import export default function MedicalRecordList() { const router = useRouter(); - const hospitals = [ - 'Hanyang Hospital', - 'Seoul Hospital', - 'Busan Hospital', - 'Incheon Hospital', - 'Daegu Hospital' - ]; const handleNavigate = (hospitalName) => { if (hospitalName === hospitals[0]) { - router.push('/(tabs)/records/medicalRecordListFull1'); - } else if (hospitalName === hospitals[1]) { - router.push('/(tabs)/records/medicalRecordListFull2'); - } else if (hospitalName === hospitals[2]) { - router.push('/(tabs)/records/medicalRecordListFull3'); - } else if (hospitalName === hospitals[3]) { - router.push('/(tabs)/records/medicalRecordListFull4'); - } else if (hospitalName === hospitals[4]) { - router.push('/(tabs)/records/medicalRecordListFull5'); - } + router.push('/(tabs)/records/medicalRecord'); + } // API 연동 후 나머지 부분 처리 }; const handleNewPress = () => { - router.push('/(tabs)/records/medicalRecordListEdit1'); + router.push('/(tabs)/records/medicalRecordEdit'); }; return ( From 51d18d90b577ffdd94747e69e95255a3e51d273a Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:58:27 +0900 Subject: [PATCH 14/28] =?UTF-8?q?docs=20:=20list=ED=98=95=ED=83=9C=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/medicalRecordList.tsx | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 features/auth/services/records/medicalRecordList.tsx diff --git a/features/auth/services/records/medicalRecordList.tsx b/features/auth/services/records/medicalRecordList.tsx new file mode 100644 index 0000000..e827ac4 --- /dev/null +++ b/features/auth/services/records/medicalRecordList.tsx @@ -0,0 +1,77 @@ +// medicalListRecord 컴포넌트화 +import React from 'react'; +import { View, Text, StyleSheet } from 'react-native'; +export default function medicalRecordList() { + return ( + + + Date of visit + + + + 2024.11.24 + + + + Visiting Hospital + + + + Hanyang Hospital + + + + Medical Subjects + + + + Hanyang Hospital + + + + Symptoms + + + + Hanyang Hospital + + + + Treatment Summary + + + + Hanyang Hospital + + + ); +} + +const styles = StyleSheet.create({ + date: { + marginTop: 32, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#434343", + fontSize: 14, + fontWeight: 400, + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + borderBottomColor: "#F5F5F5", + borderBottomWidth: 1, + }, + listText: { + color: "#000", + fontSize: 18, + fontWeight: 400, + }, +}); \ No newline at end of file From 2cf09f323fa76158bc2b109cc91fa2a3fbb30b3a Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 21:59:09 +0900 Subject: [PATCH 15/28] =?UTF-8?q?docs=20:=20list=ED=98=95=ED=83=9C=20?= =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/medicalRecord.tsx | 59 ++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 app/(tabs)/records/medicalRecord.tsx diff --git a/app/(tabs)/records/medicalRecord.tsx b/app/(tabs)/records/medicalRecord.tsx new file mode 100644 index 0000000..90d6246 --- /dev/null +++ b/app/(tabs)/records/medicalRecord.tsx @@ -0,0 +1,59 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; +import EditIcon from "@/assets/icons/EditIcon"; +import MedicalRecordList from "@/features/auth/services/records/medicalRecordList"; //medicalList import + +export default function MedicalRecordListEdit1() { + const router = useRouter(); + + const handleEditIconPress = () => { + }; + + return( + + + router.push('/(tabs)/records/medicalRecordList')} style={styles.backButton}> + + + Medical Record + + + + + + + + ); +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + }, + editIconWrapper: { + position: 'absolute', + right: 24, + top: 0, + }, + }); From 1a6256a9b310efa6c96a8ad864bf742cd83a799c Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 22:08:56 +0900 Subject: [PATCH 16/28] =?UTF-8?q?docs=20:=20healthStatusRecord=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=ED=8C=8C=EC=9D=BC=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/healthStatusList.tsx | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 features/auth/services/records/healthStatusList.tsx diff --git a/features/auth/services/records/healthStatusList.tsx b/features/auth/services/records/healthStatusList.tsx new file mode 100644 index 0000000..4ce0adf --- /dev/null +++ b/features/auth/services/records/healthStatusList.tsx @@ -0,0 +1,80 @@ +// healthstatus 컴포넌트화 +import React from 'react'; +import { View, Text, StyleSheet } from 'react-native'; +export default function healthStatusList() { + return ( + + + Disease + + + + diabetes, colic + + + + Allergy + + + + pollen, sellfish, peach + + + + Blood pressure + + + + 138 / 75 mmHg + + + + Blood sugar + + + + 90 / 164 mg/dL + + + + Medicine History + + + + dermatological + + + ); + } + + const styles = StyleSheet.create({ + date: { + marginTop: 32, + marginLeft: 24, + marginBottom: 8, + }, + dateText: { + color: "#434343", + fontSize: 14, + fontWeight: 400, + }, + list: { + marginLeft: 16, + marginRight: 16, + paddingTop: 16, + paddingBottom: 16, + borderRadius: 10, + backgroundColor: "#FFF", + paddingHorizontal: 16, + borderBottomColor: "#F5F5F5", + borderBottomWidth: 1, + }, + listText: { + color: "#000", + fontSize: 18, + fontWeight: 400, + }, + smallText:{ + fontSize:12, + }, + }); \ No newline at end of file From ea955e81fb95af7c8367056552e1576da3bf6108 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 22:09:17 +0900 Subject: [PATCH 17/28] =?UTF-8?q?docs=20:=20healthStatusRecord=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/healthStatusRecord.tsx | 61 +++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 app/(tabs)/records/healthStatusRecord.tsx diff --git a/app/(tabs)/records/healthStatusRecord.tsx b/app/(tabs)/records/healthStatusRecord.tsx new file mode 100644 index 0000000..0a85fa3 --- /dev/null +++ b/app/(tabs)/records/healthStatusRecord.tsx @@ -0,0 +1,61 @@ +import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; +import { useRouter } from 'expo-router'; +import { Ionicons } from '@expo/vector-icons'; +import EditIcon from "@/assets/icons/EditIcon"; +import HealthStatusList from "@/features/auth/services/records/healthStatusList"; //healthstatusList import + +export default function healthStatusRecord() { + const router = useRouter(); + + const handleEditIconPress = () => { + }; + + return( + + + router.push('/(tabs)/records/healthStatusRecordList')} style={styles.backButton}> + + + Health Status + + + + + + + + ); + +} + +const styles = StyleSheet.create({ + container: { + flex: 1, + backgroundColor: "#FFFFFF", + }, + backButton: { + left: 24, + position: "absolute", + zIndex: 1, + }, + header: { + marginTop: 16, + flexDirection: "row", + position: "relative", + paddingHorizontal: 24, + }, + headerTitle: { + margin: 0, + fontSize: 20, + fontWeight: 500, + flex: 1, + color: "#000", + textAlign: "center", + }, + editIconWrapper: { + position: 'absolute', + right: 24, + top: 0, + }, + +}); From 65911c029df6660526ba21039b84e1dacd944033 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Wed, 19 Mar 2025 22:10:06 +0900 Subject: [PATCH 18/28] =?UTF-8?q?setting=20:=20=EB=B3=80=EC=88=98=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/medicalRecord.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(tabs)/records/medicalRecord.tsx b/app/(tabs)/records/medicalRecord.tsx index 90d6246..21e210a 100644 --- a/app/(tabs)/records/medicalRecord.tsx +++ b/app/(tabs)/records/medicalRecord.tsx @@ -4,7 +4,7 @@ import { Ionicons } from '@expo/vector-icons'; import EditIcon from "@/assets/icons/EditIcon"; import MedicalRecordList from "@/features/auth/services/records/medicalRecordList"; //medicalList import -export default function MedicalRecordListEdit1() { +export default function MedicalRecord() { const router = useRouter(); const handleEditIconPress = () => { From 8825fc7cce969002c5cdc3bbc19bcc993ce3df2c Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:16:03 +0900 Subject: [PATCH 19/28] =?UTF-8?q?docs=20:=20=ED=8C=8C=EC=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...healthStatusRecordListEdit1.tsx => healthStatusRecordEdit.tsx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/(tabs)/records/{healthStatusRecordListEdit1.tsx => healthStatusRecordEdit.tsx} (100%) diff --git a/app/(tabs)/records/healthStatusRecordListEdit1.tsx b/app/(tabs)/records/healthStatusRecordEdit.tsx similarity index 100% rename from app/(tabs)/records/healthStatusRecordListEdit1.tsx rename to app/(tabs)/records/healthStatusRecordEdit.tsx From c1c75dcfad5dfe0325635a5b54b6a0d00fd4ba03 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:16:58 +0900 Subject: [PATCH 20/28] =?UTF-8?q?docs=20:=20=ED=8C=8C=EC=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../records/{medicalRecordListEdit1.tsx => medicalRecordEdit.tsx} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/(tabs)/records/{medicalRecordListEdit1.tsx => medicalRecordEdit.tsx} (100%) diff --git a/app/(tabs)/records/medicalRecordListEdit1.tsx b/app/(tabs)/records/medicalRecordEdit.tsx similarity index 100% rename from app/(tabs)/records/medicalRecordListEdit1.tsx rename to app/(tabs)/records/medicalRecordEdit.tsx From bc127ca22bb98b248674b9534725da4f09e9c517 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:19:03 +0900 Subject: [PATCH 21/28] =?UTF-8?q?docs=20:=20=ED=8C=8C=EC=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../records/healthStatusRecordListFull1.tsx | 128 ------------------ 1 file changed, 128 deletions(-) delete mode 100644 app/(tabs)/records/healthStatusRecordListFull1.tsx diff --git a/app/(tabs)/records/healthStatusRecordListFull1.tsx b/app/(tabs)/records/healthStatusRecordListFull1.tsx deleted file mode 100644 index ee8331f..0000000 --- a/app/(tabs)/records/healthStatusRecordListFull1.tsx +++ /dev/null @@ -1,128 +0,0 @@ -import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; -import { useRouter } from 'expo-router'; -import { Ionicons } from '@expo/vector-icons'; -import EditIcon from "@/assets/icons/EditIcon"; - -export default function MedicalRecordListEdit1() { - const router = useRouter(); - - const handleEditIconPress = () => { - }; - - return( - - - router.push('/(tabs)/records/healthStatusRecordList')} style={styles.backButton}> - - - Health Status - - - - - - - - Disease - - - - diabetes, colic - - - - Allergy - - - - pollen, sellfish, peach - - - - Blood pressure - - - - 138 / 75 mmHg - - - - Blood sugar - - - - 90 / 164 mg/dL - - - - Medicine History - - - - dermatological - - - ); -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: "#FFFFFF", - }, - backButton: { - left: 24, - position: "absolute", - zIndex: 1, - }, - header: { - marginTop: 16, - flexDirection: "row", - position: "relative", - paddingHorizontal: 24, - }, - headerTitle: { - margin: 0, - fontSize: 20, - fontWeight: 500, - flex: 1, - color: "#000", - textAlign: "center", - }, - editIconWrapper: { - position: 'absolute', - right: 24, - top: 0, - }, - editIcon: { - }, - date: { - marginTop: 32, - marginLeft: 24, - marginBottom: 8, - }, - dateText: { - color: "#434343", - fontSize: 14, - fontWeight: 400, - }, - list: { - marginLeft: 16, - marginRight: 16, - paddingTop: 16, - paddingBottom: 16, - borderRadius: 10, - backgroundColor: "#FFF", - paddingHorizontal: 16, - borderBottomColor: "#F5F5F5", - borderBottomWidth: 1, - }, - listText: { - color: "#000", - fontSize: 18, - fontWeight: 400, - }, - smallText:{ - fontSize:12, - }, -}); From 26083718885261955a0a17e743e9577c6f73750e Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Wed, 19 Mar 2025 22:19:30 +0900 Subject: [PATCH 22/28] =?UTF-8?q?docs=20:=20=ED=8C=8C=EC=9D=BC=EC=9D=B4?= =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/medicalRecordListFull1.tsx | 124 ------------------ 1 file changed, 124 deletions(-) delete mode 100644 app/(tabs)/records/medicalRecordListFull1.tsx diff --git a/app/(tabs)/records/medicalRecordListFull1.tsx b/app/(tabs)/records/medicalRecordListFull1.tsx deleted file mode 100644 index fec8612..0000000 --- a/app/(tabs)/records/medicalRecordListFull1.tsx +++ /dev/null @@ -1,124 +0,0 @@ -import { View, Text, StyleSheet, SafeAreaView, TouchableOpacity } from "react-native"; -import { useRouter } from 'expo-router'; -import { Ionicons } from '@expo/vector-icons'; -import EditIcon from "@/assets/icons/EditIcon"; - -export default function MedicalRecordListEdit1() { - const router = useRouter(); - - const handleEditIconPress = () => { - }; - - return( - - - router.push('/(tabs)/records/medicalRecordList')} style={styles.backButton}> - - - Medical Record - - - - - - - Date of visit - - - - 2024.11.24 - - - - Visiting Hospital - - - - Hanyang Hospital - - - - Medical Subjects - - - - Hanyang Hospital - - - - Symptoms - - - - Hanyang Hospital - - - - Treatment Summary - - - - Hanyang Hospital - - - ); -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - backgroundColor: "#FFFFFF", - }, - backButton: { - left: 24, - position: "absolute", - zIndex: 1, - }, - header: { - marginTop: 16, - flexDirection: "row", - position: "relative", - paddingHorizontal: 24, - }, - headerTitle: { - margin: 0, - fontSize: 20, - fontWeight: 500, - flex: 1, - color: "#000", - textAlign: "center", - }, - editIconWrapper: { - position: 'absolute', - right: 24, - top: 0, - }, - editIcon: { - }, - date: { - marginTop: 32, - marginLeft: 24, - marginBottom: 8, - }, - dateText: { - color: "#434343", - fontSize: 14, - fontWeight: 400, - }, - list: { - marginLeft: 16, - marginRight: 16, - paddingTop: 16, - paddingBottom: 16, - borderRadius: 10, - backgroundColor: "#FFF", - paddingHorizontal: 16, - borderBottomColor: "#F5F5F5", - borderBottomWidth: 1, - }, - listText: { - color: "#000", - fontSize: 18, - fontWeight: 400, - }, -}); From bcbb6306d7d0ba4c8f8ebc290167a715f39d9bd9 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:50:21 +0900 Subject: [PATCH 23/28] =?UTF-8?q?docs=20:=20=ED=8C=8C=EC=9D=BC=EA=B2=BD?= =?UTF-8?q?=EB=A1=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/(tabs)/records/healthStatusRecordList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/(tabs)/records/healthStatusRecordList.tsx b/app/(tabs)/records/healthStatusRecordList.tsx index 42fd294..4d5a9b6 100644 --- a/app/(tabs)/records/healthStatusRecordList.tsx +++ b/app/(tabs)/records/healthStatusRecordList.tsx @@ -13,7 +13,7 @@ export default function MedicalRecordList() { }; const handleNewPress = () => { - router.push('/(tabs)/records/healthStatusRecordListEdit1'); + router.push('/(tabs)/records/healthStatusRecordEdit'); }; return ( From 91a6148fe91f9694b0b99d08403f92d96c00fb87 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:52:05 +0900 Subject: [PATCH 24/28] =?UTF-8?q?docs=20:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=84=EB=8B=A8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/healthStatusList.tsx | 72 +++++++------------ 1 file changed, 26 insertions(+), 46 deletions(-) diff --git a/features/auth/services/records/healthStatusList.tsx b/features/auth/services/records/healthStatusList.tsx index 4ce0adf..90013f9 100644 --- a/features/auth/services/records/healthStatusList.tsx +++ b/features/auth/services/records/healthStatusList.tsx @@ -1,52 +1,32 @@ // healthstatus 컴포넌트화 import React from 'react'; import { View, Text, StyleSheet } from 'react-native'; -export default function healthStatusList() { +const healthData = [ + { title: "Disease", value: "diabetes, colic" }, + { title: "Allergy", value: "pollen, shellfish, peach" }, + { title: "Blood pressure", value: "138 / 75", unit: "mmHg" }, + { title: "Blood sugar", value: "90 / 164", unit: "mg/dL" }, + { title: "Medicine History", value: "dermatological" }, + ]; + + export default function HealthStatusList() { return ( - - - Disease - - - - diabetes, colic - - - - Allergy - - - - pollen, sellfish, peach - - - - Blood pressure - - - - 138 / 75 mmHg - - - - Blood sugar - - - - 90 / 164 mg/dL - - - - Medicine History - - - - dermatological - - - ); - } - + <> + {healthData.map((item, index) => ( + + + {item.title} + + + + {item.value} {item.unit && {item.unit}} + + + + ))} + + ); + } const styles = StyleSheet.create({ date: { marginTop: 32, @@ -77,4 +57,4 @@ export default function healthStatusList() { smallText:{ fontSize:12, }, - }); \ No newline at end of file + }); From d92317c854db80a25cad22a35061e4b0b4054d24 Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Fri, 21 Mar 2025 13:52:47 +0900 Subject: [PATCH 25/28] =?UTF-8?q?docs=20:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=84=EB=8B=A8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/medicalRecordList.tsx | 66 +++++++------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/features/auth/services/records/medicalRecordList.tsx b/features/auth/services/records/medicalRecordList.tsx index e827ac4..2f12e77 100644 --- a/features/auth/services/records/medicalRecordList.tsx +++ b/features/auth/services/records/medicalRecordList.tsx @@ -1,52 +1,30 @@ // medicalListRecord 컴포넌트화 import React from 'react'; import { View, Text, StyleSheet } from 'react-native'; -export default function medicalRecordList() { +const medicalData = [ + { title: "Date of visit", value: "2024.11.24" }, + { title: "Visiting Hospital", value: "Hanyang Hospital" }, + { title: "Medical Subjects", value: "Hanyang Hospital" }, + { title: "Symptoms", value: "Hanyang Hospital" }, + { title: "Treatment Summary", value: "Hanyang Hospital" }, +]; + +export default function MedicalRecordList() { return ( - - - Date of visit - - - - 2024.11.24 - - - - Visiting Hospital - - - - Hanyang Hospital - - - - Medical Subjects - - - - Hanyang Hospital - - - - Symptoms - - - - Hanyang Hospital - - - - Treatment Summary - - - - Hanyang Hospital - - + <> + {medicalData.map((item, index) => ( + + + {item.title} + + + {item.value} + + + ))} + ); } - const styles = StyleSheet.create({ date: { marginTop: 32, @@ -74,4 +52,4 @@ const styles = StyleSheet.create({ fontSize: 18, fontWeight: 400, }, -}); \ No newline at end of file +}); From 21a975d457d68b53947af8d8315b6d7770c6067e Mon Sep 17 00:00:00 2001 From: JIN <134291854+Hwangchanjin@users.noreply.github.com> Date: Fri, 21 Mar 2025 14:10:45 +0900 Subject: [PATCH 26/28] =?UTF-8?q?docs=20:=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=84=EB=8B=A8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/medicalRecordDetails.tsx | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/features/auth/services/records/medicalRecordDetails.tsx b/features/auth/services/records/medicalRecordDetails.tsx index e3dd06e..d4c9c14 100644 --- a/features/auth/services/records/medicalRecordDetails.tsx +++ b/features/auth/services/records/medicalRecordDetails.tsx @@ -2,30 +2,29 @@ import React from 'react'; import { View, Text, StyleSheet } from 'react-native'; +const medicalDetail = [ + { title: "Date of visit", value: "2024.11.24" }, + { title: "Visiting Hospital", value: "Hanyang Hospital" }, + { title: "Medical Subjects", value: "sgdggsdgfg" }, + { title: "Symptoms", value: "sgdfgsdgfg" }, + { title: "Treatment Summary", value: "Hanyang Hospital" }, +]; export default function MedicalRecordDetails() { return ( - - Date of visit - 2024.11.24 - - - Visiting Hospital - Hanyang Hospital - - - Medical Subjects - sgdfgsdgfg - - - Symptoms - sgdfgsdgfg - - - Treatment Summary - asdfasdfasasdfasdfasdfasf - + {medicalDetail.map((item, index) => ( + + {item.title} + {item.value} + + ))} ); } @@ -61,4 +60,4 @@ const styles = StyleSheet.create({ borderBottomLeftRadius: 10, borderBottomRightRadius: 10, }, -}); \ No newline at end of file +}); From 4ec2624bc6759bbe141663aaf8db9231c1fc5465 Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Fri, 21 Mar 2025 15:11:31 +0900 Subject: [PATCH 27/28] =?UTF-8?q?fix=20:=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/auth/services/records/medicalRecordDetails.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/features/auth/services/records/medicalRecordDetails.tsx b/features/auth/services/records/medicalRecordDetails.tsx index d4c9c14..a284928 100644 --- a/features/auth/services/records/medicalRecordDetails.tsx +++ b/features/auth/services/records/medicalRecordDetails.tsx @@ -17,12 +17,12 @@ export default function MedicalRecordDetails() { - {item.title} - {item.value} + {item.title} + {item.value} ))} From ac8345aec67bfa86b44ef7296a99fdb548d4b1ba Mon Sep 17 00:00:00 2001 From: Hwangchanjin Date: Fri, 21 Mar 2025 15:15:47 +0900 Subject: [PATCH 28/28] =?UTF-8?q?docs=20:=20=EB=B0=98=EB=B3=B5=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/records/healthStatusDetails.tsx | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/features/auth/services/records/healthStatusDetails.tsx b/features/auth/services/records/healthStatusDetails.tsx index af7fba3..87a0dcc 100644 --- a/features/auth/services/records/healthStatusDetails.tsx +++ b/features/auth/services/records/healthStatusDetails.tsx @@ -2,25 +2,32 @@ import React from 'react'; import { View, Text, StyleSheet } from 'react-native'; +const HealthStatusDetail = [ + { title: "Diease", value: "asdfasdfasd" }, + { title: "Allergy", value: "asdfasdfasd" }, + { title: "Blood Pressure", value: "asdfasdfasd" }, +]; export default function HealthStatusDetails() { return ( - - Disease - asdfasdfasd - - - Allergy - asdfasdfasd - - - Blood pressure - asdfasdfasd - - + {HealthStatusDetail.map((item, index) => ( + + {item.title} + {item.value} + + ))} + ); } + + const styles = StyleSheet.create({ recordItemBottom: { backgroundColor:"#FFFFFF",