Skip to content
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.

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

함종현 멘토님 리뷰용 PR #315

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion src/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import LoginSection from '@/components/login';
import LoginSection from '@/components/Login';
import * as S from '../Auth.styled';

export default function Login() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/(auth)/signup/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import SignupSection from '@/components/signup';
import SignupSection from '@/components/Signup';
import * as S from '../Auth.styled';

export default function Signup() {
Expand Down
2 changes: 1 addition & 1 deletion src/app/day/[year]/[month]/[day]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import React from 'react';
import Todo from '@/components/todo';
import Todo from '@/components/Todo';
import { BasicContainer } from '@/components/common';
import TimeTable from '@/components/TimeTable';
import Header from '@/components/Header';
Expand Down
2 changes: 1 addition & 1 deletion src/app/mypage/category/CategoryModal.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Box, Button, FormControlLabel, Modal, Switch, TextField, Typography } from '@mui/material';
import { TodoModalStyle } from '@/components/todo/Todo.styled';
import { TodoModalStyle } from '@/components/Todo/Todo.styled';
import ColorPickerBox from '@/components/ColorPickerBox';
import { CreateCategoryInfo } from '@/api/queryFn/categoryQueryFn';
import DeleteCategoryButton from './DeleteCategoryButton';
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import Header from '@/components/Header';
import Todo from '@/components/todo';
import Todo from '@/components/Todo';
import { BasicContainer } from '@/components/common';
import TimeTable from '@/components/TimeTable';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function LoginSection() {
router.push('/');
} else {
setIsLoading(false);

alert('일치하는 이메일, 비밀번호가 없습니다');
}
};
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import styled from '@emotion/styled';
import { ANIMATION_ROTATE } from '@/components/todo/Todo.styled';
import { ANIMATION_ROTATE } from '@/components/Todo/Todo.styled';

const Card = styled.div`
z-index: 1;
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/components/todo/Todo.tsx → src/components/Todo/Todo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import * as S from '@/components/todo/Todo.styled';
import * as S from '@/components/Todo/Todo.styled';
import { Text } from '@/components/common';
import TodoRecordButton from '@/components/todo/TodoRecordButton';
import TodoRecordButton from '@/components/Todo/TodoRecordButton';
import Box from '@mui/material/Box';

interface TodoProps {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useQueryClient } from '@tanstack/react-query';
import { useGetOneTodo, useUpdateTodoTime } from '@/api/hooks/todoHooks';
import { useAppSelector } from '@/lib/hooks';
import { selectTodoData } from '@/lib/todos/todoDataSlice';
import GlowingBorder from '@/components/todo/GlowingBorder';
import Todo from '@/components/todo/Todo';
import GlowingBorder from '@/components/Todo/GlowingBorder';
import Todo from '@/components/Todo/Todo';
import { endOfDay } from 'date-fns';
import { toZonedTime } from 'date-fns-tz';
import { TIME_ZONE } from '@/constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect } from 'react';
import { Box, Skeleton } from '@mui/material';
import { useDispatch } from 'react-redux';
import { openModal, closeModalByFAB, setModalMode } from '@/lib/todos/todoUISlice';
import TodoWrapper from '@/components/todo/TodoList/TodoWrapper';
import TodoWrapper from '@/components/Todo/TodoList/TodoWrapper';
import { selectTodoData, setTodoId, setLoading, setTodoListData } from '@/lib/todos/todoDataSlice';
import { useGetTodosMatchingDate } from '@/api/hooks/todoHooks';
import { useSession } from 'next-auth/react';
Expand Down
12 changes: 6 additions & 6 deletions src/components/todo/index.tsx → src/components/Todo/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import React, { useEffect, useMemo } from 'react';
import { useAppDispatch } from '@/lib/hooks';
import { setDisplayingDate, setSessionId } from '@/lib/todos/todoDataSlice';
import TodoHeader from '@/components/todo/TodoHeader';
import TodoPagination from '@/components/todo/TodoPagination';
import TodoCalendar from '@/components/todo/TodoCalendar';
import TodoReport from '@/components/todo/TodoReport';
import TodoList from '@/components/todo/TodoList/index';
import * as S from '@/components/todo/Todo.styled';
import TodoHeader from '@/components/Todo/TodoHeader';
import TodoPagination from '@/components/Todo/TodoPagination';
import TodoCalendar from '@/components/Todo/TodoCalendar';
import TodoReport from '@/components/Todo/TodoReport';
import TodoList from '@/components/Todo/TodoList/index';
import * as S from '@/components/Todo/Todo.styled';
import { useSession } from 'next-auth/react';
import { useParams } from 'next/navigation';
import { getToday } from '@/constants';
Expand Down
Loading