Merge pull request #51 from wafflestudio/haram

fix: default img, name setting logic

Author: h-seo-n

src/pages/CalendarView.tsx

@@ -79,7 +79,15 @@ const CalendarView = () => {
 			await fetchMonthEvents(paramMonth);
 		};
 		loadMonthEvents();
-	}, [currentDate, fetchMonthEvents, globalCategory, globalOrg, globalStatus, excludedKeywords, interestCategories]);
+	}, [
+		currentDate,
+		fetchMonthEvents,
+		globalCategory,
+		globalOrg,
+		globalStatus,
+		excludedKeywords,
+		interestCategories,
+	]);
 
 	useEffect(() => {
 		const getWeekRangeByDate = (date: Date) => {

src/pages/auth/OnBoarding/ProfileSetting.tsx

@@ -9,23 +9,23 @@ export default function ProfileSetting() {
 	const [, setSearchParams] = useSearchParams();
 	const { updateUser } = useAuth();
 
-	const DEFAULT_PROFILE_URL = defaultProfile;
+	const defaultName = "푱푱한 토끼";
 	const [name, setName] = useState<string>("");
-	const [previewUrl, setPreviewUrl] = useState(DEFAULT_PROFILE_URL);
+	const [previewUrl, setPreviewUrl] = useState(defaultProfile);
 	const [imgFile, setImgFile] = useState<File | null>(null);
-	const [, setIsDefaultProfile] = useState(true);
 
 	const handleImageChange = (e: React.ChangeEvent<HTMLInputElement>) => {
 		const file = e.target.files?.[0];
 		if (!file) return;
 		setImgFile(file);
 		setPreviewUrl(URL.createObjectURL(file));
-		setIsDefaultProfile(false);
 	};
 
-	const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+	const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
 		e.preventDefault();
-		updateUser(name, imgFile);
+		const finalName = name.trim() === "" ? defaultName : name.trim();
+
+		await updateUser(finalName, imgFile);
 
 		setSearchParams((prev) => {
 			const next = new URLSearchParams(prev);
@@ -34,7 +34,6 @@ export default function ProfileSetting() {
 		});
 	};
 
-	// profile image preview url cleanup (cleanup callback is executed before next effect / component unmount)
 	useEffect(() => {
 		return () => {
 			if (previewUrl?.startsWith("blob:")) {
@@ -77,7 +76,7 @@ export default function ProfileSetting() {
 					/>
 
 					<button className={styles.submit} type="submit">
-						닉네임 설정하기
+						완료
 					</button>
 				</form>
 			</div>

src/pages/bookmark/Bookmark.tsx

@@ -45,38 +45,38 @@ const BookmarksPage = () => {
 	const { showDetail, clickedEventId } = useDetail();
 
 	return (
-			<div className={styles.container}>
-				<div className={styles.bookmarksPage}>
-					<Navigationbar />
-					<div className={styles.bookmarksHeader}>
-						<FaChevronLeft
-							className={styles.backBtn}
-							color="ABABAB"
-							size={18}
-							onClick={() => navigate("/my")}
-						/>
-						<div className={styles.row}>
-							<span>내 찜 목록</span>
-							<img src="/assets/Bookmarked.svg" alt="filled bookmark icon" />
-						</div>
+		<div className={styles.container}>
+			<div className={styles.bookmarksPage}>
+				<Navigationbar />
+				<div className={styles.bookmarksHeader}>
+					<FaChevronLeft
+						className={styles.backBtn}
+						color="ABABAB"
+						size={18}
+						onClick={() => navigate("/my")}
+					/>
+					<div className={styles.row}>
+						<span>내 찜 목록</span>
+						<img src="/assets/Bookmarked.svg" alt="filled bookmark icon" />
 					</div>
-					<div className={styles.cardsColumn}>
-						{bookmarkedEvents &&
-							bookmarkedEvents.length > 0 &&
-							bookmarkedEvents.map((e) => <GalleryCard key={e.id} event={e} />)}
-					</div>
-					{(!bookmarkedEvents || bookmarkedEvents.length === 0) && (
-						<span
-							className={styles.noneText}
-						>{`아직 찜된 행사가 없습니다.\n관심있는 행사를 찜해보세요!`}</span>
-					)}
 				</div>
-				{showDetail && clickedEventId !== undefined && (
-					<div className={styles.sidePanel}>
-						<DetailView eventId={clickedEventId} />
-					</div>
+				<div className={styles.cardsColumn}>
+					{bookmarkedEvents &&
+						bookmarkedEvents.length > 0 &&
+						bookmarkedEvents.map((e) => <GalleryCard key={e.id} event={e} />)}
+				</div>
+				{(!bookmarkedEvents || bookmarkedEvents.length === 0) && (
+					<span
+						className={styles.noneText}
+					>{`아직 찜된 행사가 없습니다.\n관심있는 행사를 찜해보세요!`}</span>
 				)}
 			</div>
+			{showDetail && clickedEventId !== undefined && (
+				<div className={styles.sidePanel}>
+					<DetailView eventId={clickedEventId} />
+				</div>
+			)}
+		</div>
 	);
 };