Skip to content
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
17 changes: 14 additions & 3 deletions src/components/common/modals/edit-homework-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@ import { Modal } from '@/components/common/ui/modal';

import { useEditHomework } from '@/hooks/queries/group-study-homework-api';
import { useToastStore } from '@/stores/use-toast-store';
import { formatExternalLink } from '@/utils/format';
import { isValidUrl } from '@/utils/validation';

const EditHomeworkFormSchema = z.object({
textContent: z.string().min(1, '과제 상세 λ‚΄μš©μ„ μž…λ ₯ν•΄μ£Όμ„Έμš”.').max(1000),
attachmentLink: z.string().optional(),
attachmentLink: z
.string()
.optional()
.refine((val) => !val || isValidUrl(val), {
message: 'μ˜¬λ°”λ₯Έ URL ν˜•μ‹μ„ μž…λ ₯ν•΄μ£Όμ„Έμš”. (예: https://example.com)',
}),
});

type EditHomeworkFormValues = z.infer<typeof EditHomeworkFormSchema>;
Expand Down Expand Up @@ -98,7 +105,11 @@ function EditHomeworkForm({
homeworkId,
request: {
textContent: values.textContent,
optionalSubmission: { link: values.attachmentLink },
optionalSubmission: {
link: values.attachmentLink
? formatExternalLink(values.attachmentLink)
: values.attachmentLink,
},
},
},
{
Expand Down Expand Up @@ -127,7 +138,7 @@ function EditHomeworkForm({
label="과제 상세 λ‚΄μš©"
direction="vertical"
required
maxCharCount={5000}
maxCharCount={1000}
showCounterRight={false}
>
<TextAreaInput
Expand Down
15 changes: 13 additions & 2 deletions src/components/common/modals/submit-homework-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,17 @@ import { Modal } from '@/components/common/ui/modal';

import { useSubmitHomework } from '@/hooks/queries/group-study-homework-api';
import { useToastStore } from '@/stores/use-toast-store';
import { formatExternalLink } from '@/utils/format';
import { isValidUrl } from '@/utils/validation';

const SubmitHomeworkFormSchema = z.object({
textContent: z.string().min(1, '과제 상세 λ‚΄μš©μ„ μž…λ ₯ν•΄μ£Όμ„Έμš”.').max(1000),
attachmentLink: z.string().optional(),
attachmentLink: z
.string()
.optional()
.refine((val) => !val || isValidUrl(val), {
message: 'μ˜¬λ°”λ₯Έ URL ν˜•μ‹μ„ μž…λ ₯ν•΄μ£Όμ„Έμš”. (예: https://example.com)',
}),
});

type SubmitHomeworkFormValues = z.infer<typeof SubmitHomeworkFormSchema>;
Expand Down Expand Up @@ -98,7 +105,11 @@ function SubmitHomeworkForm({
missionId,
request: {
textContent: values.textContent,
optionalSubmission: { link: values.attachmentLink },
optionalSubmission: {
link: values.attachmentLink
? formatExternalLink(values.attachmentLink)
: values.attachmentLink,
},
},
},
{
Expand Down
7 changes: 5 additions & 2 deletions src/components/contents/homework-detail-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
} from '@/hooks/queries/peer-review-api';

import { useUserStore } from '@/stores/useUserStore';
import { formatExternalLink } from '@/utils/format';

const ConfirmDeleteModal = dynamic(
() => import('@/components/common/modals/confirm-delete-modal'),
Expand Down Expand Up @@ -132,7 +133,9 @@ export default function HomeworkDetailContent({
μ œμΆœν•œ 과제
</span>
<a
href={homework.homeworkContent.optionalContent.link}
href={formatExternalLink(
homework.homeworkContent.optionalContent.link,
)}
target="_blank"
rel="noopener noreferrer"
className="text-text-brand font-designer-14r hover:underline"
Expand All @@ -146,7 +149,7 @@ export default function HomeworkDetailContent({
{/* ν”Όμ–΄ 리뷰 */}
<PeerReviewSection
homeworkId={homeworkId}
peerReviews={peerReviews ?? []}
peerReviews={peerReviews}
isMyHomework={isMyHomework}
/>
</div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/hall-of-fame/mvp-team-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { cn } from '@/components/common/ui/(shadcn)/lib/utils';
import UserAvatar from '@/components/common/ui/avatar';
import Tooltip from '@/components/common/ui/tooltip';
import type { MVPTeam } from '@/types/one-to-one-study/hall-of-fame';
import { formatExternalLink } from '@/utils/format';

interface MVPTeamCardProps {
team: MVPTeam;
Expand Down Expand Up @@ -104,7 +105,7 @@ export default function MVPTeamCard({ team, className }: MVPTeamCardProps) {
{team.sharedLinks.map((link, i) => (
<a
key={link.id}
href={link.url}
href={formatExternalLink(link.url)}
target="_blank"
rel="noopener noreferrer"
className="font-designer-13r text-text-subtle hover:text-text-information flex items-center gap-100 truncate transition-all hover:underline"
Expand Down
3 changes: 2 additions & 1 deletion src/components/lists/study-list-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
type DailyStudy,
type GetDailyStudiesResponse,
} from '@/types/api/schedule.types';
import { formatExternalLink } from '@/utils/format';
import LinkIcon from 'public/icons/Link.svg';

const TABLE_HEADERS = [
Expand Down Expand Up @@ -61,7 +62,7 @@ function mapDailyStudyToDisplayData(
'μ§„ν–‰ μƒνƒœ': getStatusBadge(row.progressStatus),
'참고 자료': row.link ? (
<a
href={row.link}
href={formatExternalLink(row.link)}
target="_blank"
rel="noopener noreferrer"
onClick={() => {
Expand Down
5 changes: 4 additions & 1 deletion src/components/schedule/today-study-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { TUTORIAL_DAILY_STUDY_MOCK } from '@/config/tutorial-mock';
import { useAuthReady } from '@/features/auth/model/use-auth';
import { useDailyStudyDetailQuery } from '@/hooks/queries/use-interview-query';
import { DailyStudyDetail } from '@/types/api/interview.types';
import { formatExternalLink } from '@/utils/format';

const StudyDoneModal = dynamic(
() => import('@/components/common/modals/study-done-modal'),
Expand Down Expand Up @@ -364,11 +365,13 @@ function StudySubject({ subject }: Pick<DailyStudyDetail, 'subject'>) {
}

function StudyLink({ link }: Pick<DailyStudyDetail, 'link'>) {
if (!link) return null;

return (
<div className="bg-background-alternative rounded-50 col-span-2 flex items-center gap-300 px-300 py-250">
<span className="text-sm text-gray-600">μŠ€ν„°λ”” 링크</span>

<Link href={link} target="_blank" rel="noreferrer">
<Link href={formatExternalLink(link)} target="_blank" rel="noreferrer">
<div className="flex cursor-pointer gap-75">
<Image
src="icons/Link.svg"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import type {
NoteConsultationChannel,
NoteConsultationListItem,
} from '@/types/mentoring/note-consultation-view';
import { formatExternalLink } from '@/utils/format';

function UserAvatar({
name,
Expand Down Expand Up @@ -141,7 +142,7 @@ function QuestionCard({ request }: { request: MentoringRequest }) {
{request.referenceLinks?.map((link) => (
<a
key={link}
href={link}
href={formatExternalLink(link)}
target="_blank"
rel="noopener noreferrer"
className="font-designer-11m text-text-brand border-border-subtle inline-flex items-center gap-50 rounded-full border px-100 py-50 underline"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
import dynamic from 'next/dynamic';
import UserAvatar from '@/components/common/ui/avatar';
import { StudyHistoryItem } from '@/types/one-to-one-study/study-history';
import { formatExternalLink } from '@/utils/format';

const UserProfileModal = dynamic(
() => import('@/components/common/modals/user-profile-modal'),
Expand Down Expand Up @@ -121,7 +122,7 @@ export const StudyHistoryRow = ({ item }: { item: StudyHistoryItem }) => {
<div className="flex w-[80px] shrink-0 justify-center">
{item.link ? (
<a
href={item.link}
href={formatExternalLink(item.link)}
target="_blank"
rel="noopener noreferrer"
className="text-text-subtle hover:text-text-strong group flex items-center justify-center p-100 transition-all"
Expand Down
19 changes: 19 additions & 0 deletions src/utils/format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,22 @@ export function formatPhoneNumber(value: string | undefined): string {

return `${numbers.slice(0, 3)}-${numbers.slice(3, 7)}-${numbers.slice(7, 11)}`;
}

/**
* μ™ΈλΆ€ 링크 ν¬λ§·νŒ… ν•¨μˆ˜
* http:// λ˜λŠ” https://둜 μ‹œμž‘ν•˜μ§€ μ•ŠλŠ” 경우 https://λ₯Ό μ ‘λ‘μ‚¬λ‘œ μΆ”κ°€ν•©λ‹ˆλ‹€.
*/
export function formatExternalLink(url: string | undefined): string {
if (!url) return '';
const trimmedUrl = url.trim();
if (/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmedUrl)) {
return trimmedUrl;
}

// λ§ˆμΉ¨ν‘œκ°€ 있고 곡백이 μ—†λŠ” κ²½μš°μ—λ§Œ https:// 보정 (예: "github" β†’ 보정 μ•ˆ 함)
if (trimmedUrl.includes('.') && !trimmedUrl.includes(' ')) {
return `https://${trimmedUrl}`;
}

return trimmedUrl;
}
22 changes: 22 additions & 0 deletions src/utils/validation.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
export function isNumeric(str: string) {
return /^\d+$/.test(str);
}

/**
* URL ν˜•μ‹ 검증 ν•¨μˆ˜
* λ§ˆμΉ¨ν‘œκ°€ ν¬ν•¨λ˜κ³  곡백이 μ—†λŠ” κ²½μš°μ—λ§Œ μœ νš¨ν•œ URL둜 νŒλ‹¨ν•©λ‹ˆλ‹€.
* http/https ν”„λ‘œν† μ½œμ΄ μ—†μœΌλ©΄ https://λ₯Ό λΆ™μ—¬μ„œ URL νŒŒμ‹±μ„ μ‹œλ„ν•©λ‹ˆλ‹€.
*/
export function isValidUrl(url: string): boolean {
const trimmed = url.trim();
if (!trimmed || trimmed.includes(' ') || !trimmed.includes('.')) return false;

try {
const withProtocol =
trimmed.startsWith('http://') || trimmed.startsWith('https://')
? trimmed
: `https://${trimmed}`;
new URL(withProtocol);

return true;
} catch {
return false;
}
}
Loading