Skip to content

Commit

Permalink
Merge pull request #41 from mbti-nf-team/refactor/nf-team-core
Browse files Browse the repository at this point in the history
refactor: nf-team/core의 애매한 변수명 수정
  • Loading branch information
saseungmin authored Nov 9, 2024
2 parents 4dd55fb + 0d4be68 commit 7c091d2
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 34 deletions.
26 changes: 13 additions & 13 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
},
"homepage": "https://github.com/mbti-nf-team/birth-tunes-frontend#readme",
"dependencies": {
"@nf-team/core": "^2.1.0",
"@nf-team/react": "^2.7.1",
"@nf-team/core": "^3.0.1",
"@nf-team/react": "^2.7.2",
"@tanem/react-nprogress": "^5.0.48",
"@tanstack/react-query": "^5.59.16",
"axios": "^1.4.0",
Expand Down
4 changes: 2 additions & 2 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Metadata, ResolvingMetadata } from 'next';

import { removeNullable } from '@nf-team/core';
import { getStringOrDefault } from '@nf-team/core';
import dayjs from 'dayjs';

import Footer from '@/components/Footer';
Expand Down Expand Up @@ -45,7 +45,7 @@ export async function generateMetadata(
}

function Home({ searchParams }: Props) {
const defaultBirthDate = removeNullable(searchParams?.date);
const defaultBirthDate = getStringOrDefault(searchParams?.date);

const isNotValidDefaultDate = defaultBirthDate
&& (!dayjs(defaultBirthDate).isValid() || dayjs().isBefore(dayjs(defaultBirthDate)));
Expand Down
10 changes: 5 additions & 5 deletions src/components/main/BirthSelectDatePicker/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
ChangeEvent, Dispatch, SetStateAction, useCallback, useEffect, useMemo, useState,
} from 'react';

import { checkNumber, generateArrayOfNumber } from '@nf-team/core';
import { createNumberArray, getNumberOrDefault } from '@nf-team/core';
import { useUpdateEffect } from '@nf-team/react';
import dayjs from 'dayjs';

Expand Down Expand Up @@ -55,7 +55,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) {
if (year && month) {
const targetDays = dayjs(`${year}-${month}`).daysInMonth();

setDaysRange(checkNumber(targetDays));
setDaysRange(getNumberOrDefault(targetDays));
}
}, [month, year]);

Expand All @@ -80,7 +80,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) {
return (
<div className={styles.birthSelectDatePickerWrapper}>
<SelectBox id="year" emptyOption="생년" value={year} onChange={handleChange('year')}>
{generateArrayOfNumber(yearRange).map((number) => {
{createNumberArray(yearRange).map((number) => {
const targetYear = nowYear - number;

return (
Expand All @@ -89,7 +89,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) {
})}
</SelectBox>
<SelectBox id="month" emptyOption="월" value={month} onChange={handleChange('month')}>
{generateArrayOfNumber(monthRange).map((number) => {
{createNumberArray(monthRange).map((number) => {
const targetMonth = number + 1;

return (
Expand All @@ -98,7 +98,7 @@ function BirthSelectDatePicker({ defaultBirthDate, onBirthChange }: Props) {
})}
</SelectBox>
<SelectBox id="days" emptyOption="일" value={days} onChange={handleChange('days')} disabled={!year || !month}>
{generateArrayOfNumber(daysRange).map((day) => {
{createNumberArray(daysRange).map((day) => {
const targetDays = day + 1;

return (
Expand Down
6 changes: 4 additions & 2 deletions src/components/main/BirthSongResult/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { useCallback, useEffect, useRef } from 'react';

import { removeNullable } from '@nf-team/core';
import { getStringOrDefault } from '@nf-team/core';
import { DelayRenderComponent } from '@nf-team/react';
import { useQuery } from '@tanstack/react-query';
import clsx from 'clsx';
Expand Down Expand Up @@ -124,7 +124,9 @@ function BirthSongResult({ birthDate }: Props) {
{findBirthSong?.title}
</div>
</FrameTitle>
<IframeVideoPlayer youtubeVideoId={removeNullable(findBirthSong?.youtube_video_id)} />
<IframeVideoPlayer
youtubeVideoId={getStringOrDefault(findBirthSong?.youtube_video_id)}
/>
</div>
<Button buttonType="secondary" type="button" onClick={onClickShareLink}>결과 공유하기</Button>
</div>
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1002,10 +1002,10 @@ __metadata:
languageName: node
linkType: hard

"@nf-team/core@npm:^2.1.0":
version: 2.1.0
resolution: "@nf-team/core@npm:2.1.0"
checksum: 10/d1626bd75ff37bfa5871469117e45909597da2ae5f5c497b631fecfb9f681ae8f1243a5e99f7af2564352f298d30d1e8b0086748ecaf7fe5d6543dc16e4940d7
"@nf-team/core@npm:^3.0.1":
version: 3.0.1
resolution: "@nf-team/core@npm:3.0.1"
checksum: 10/16f0912284bebaf66245d0a4050f02ad97f7dfaa22be7d25b92dd79af5247caae3fe7651ed76aee4add835a4362209572a33c1a56d0a2aaa6031543fd0e71992
languageName: node
linkType: hard

Expand Down Expand Up @@ -1038,13 +1038,13 @@ __metadata:
languageName: node
linkType: hard

"@nf-team/react@npm:^2.7.1":
version: 2.7.1
resolution: "@nf-team/react@npm:2.7.1"
"@nf-team/react@npm:^2.7.2":
version: 2.7.2
resolution: "@nf-team/react@npm:2.7.2"
peerDependencies:
react: ^18
react-dom: ^18
checksum: 10/bf13a0df2ca47552cface1789de681c56340ac48209d270ed2670e4887f2a0a735cc5cf15a7e421730b502ce3fb6fcd8d8d73795d2a6b44f4aed9943e2b61f3d
checksum: 10/037cc7dc3f6910b9681c7054f972f880366175a5d638ffd457cd2426b74647ade803a3aeb7d7931f0171f14e2af8036cfda1c61587130030fa44ddf14a56cf0c
languageName: node
linkType: hard

Expand Down Expand Up @@ -2332,9 +2332,9 @@ __metadata:
resolution: "birth-tunes-frontend@workspace:."
dependencies:
"@next/eslint-plugin-next": "npm:^14.2.3"
"@nf-team/core": "npm:^2.1.0"
"@nf-team/core": "npm:^3.0.1"
"@nf-team/eslint-config": "npm:^3.4.0"
"@nf-team/react": "npm:^2.7.1"
"@nf-team/react": "npm:^2.7.2"
"@nf-team/stylelint-config": "npm:^1.1.1"
"@tanem/react-nprogress": "npm:^5.0.48"
"@tanstack/react-query": "npm:^5.59.16"
Expand Down

0 comments on commit 7c091d2

Please sign in to comment.