Skip to content

merge develop to main #73

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.

Sign up for GitHub

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

Merged
seong-jin-jo merged 1 commit into from
Jun 28, 2025
Merged

merge develop to main #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/features/auth/ui/login-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@ export default function LoginModal({
}

const isLocal = origin.includes('localhost') || origin.includes('127.0.0.1'); // 로컬환경 테스트용
localStorage.setItem('isLocal', JSON.stringify(isLocal));

console.log("로컬 환경 여부", isLocal);
const API_BASE_URL = isLocal
? 'test-api.zeroone.it.kr'
? 'https://test-api.zeroone.it.kr'
: process.env.NEXT_PUBLIC_API_BASE_URL;

const KAKAO_CLIENT_ID = isLocal
Expand Down
4 changes: 2 additions & 2 deletions src/features/study/ui/today-study-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ export default function TodayStudyCard({ date }: Props) {
const params = {
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
day: date.getDate() + 1,
};

const { data, isLoading, error } = useDailyStudyDetailQuery(params);

const { data, isLoading, error } = useDailyStudyDetailQuery(params);
if (isLoading) return <div>로딩 중...</div>;
if (error || !data) return <div>에러 발생</div>;

Expand Down
2 changes: 1 addition & 1 deletion src/widgets/home/study-list-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function mapDailyStudyToDisplayData(
export default function StudyListSection({ date }: Props) {
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
const day = date.getDate() +1;

const { data, isLoading, error } = useDailyStudiesQuery({
cursor: 0,
Expand Down