Skip to content

Commit

Permalink
chore: 절대 경로 수정에 따른 변경점 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
Low-ProFiles committed Nov 10, 2024
1 parent 98af70c commit f76f856
Show file tree
Hide file tree
Showing 85 changed files with 328 additions and 324 deletions.
30 changes: 15 additions & 15 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
import { BrowserRouter, Routes, Route } from 'react-router-dom';
import { CalendarPage, ExtraCalendarPage } from '@pages/calendar';
import { LoginPage, LoginCompletePage } from '@pages/login';
import { ManagementPage, ExtraManagementPage } from '@pages/management';
import { MemoPage, ExtraMemoPage } from '@pages/memo';
import { MyPage, ExtraMyPage } from '@pages/mypage';
import { SharePage, ExtraSharePage } from '@pages/share';
import { TodoListPage, ExtraTodoListPage } from '@pages/todo-list';
import { CalendarPage, ExtraCalendarPage } from '@/pages/calendar';
import { LoginPage, LoginCompletePage } from '@/pages/login';
import { ManagementPage, ExtraManagementPage } from '@/pages/management';
import { MemoPage, ExtraMemoPage } from '@/pages/memo';
import { MyPage, ExtraMyPage } from '@/pages/mypage';
import { SharePage, ExtraSharePage } from '@/pages/share';
import { TodoListPage, ExtraTodoListPage } from '@/pages/todo-list';
import {
CreateTeamPage,
JoinTeamPage,
TeamPage,
ShareTeamPage
} from '@pages/team';
import ErrorPage from '@pages/error';
import { ProfilePage } from '@pages/mypage/profile';
import { PortfolioPage } from '@pages/mypage/portfolio';
import MainPage from '@pages/main/main';
import Layout from '@components/Layout';
import { SignupPage } from '@pages/signup/signup';
import { RequireAuth } from '@hooks/useRequireAuth';
} from '@/pages/team';
import ErrorPage from '@/pages/error';
import { ProfilePage } from '@/pages/mypage/profile';
import { PortfolioPage } from '@/pages/mypage/portfolio';
import MainPage from '@/pages/main/main';
import Layout from '@/components/Layout';
import { SignupPage } from '@/pages/signup/signup';
import { RequireAuth } from '@/hooks/useRequireAuth';

const App = () => {
return (
Expand Down
12 changes: 6 additions & 6 deletions src/components/Alarm/alarm.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useState, useEffect } from 'react';
import styled, { keyframes } from 'styled-components';
import ClosedBtn from '@assets/calendar/closed-btn.svg';
import Quit from '@assets/alarm/quit.svg';
import Remind from '@assets/alarm/remind.svg';
import WakeUp from '@assets/alarm/wake-up.svg';
import ClosedBtn from '@/assets/calendar/closed-btn.svg';
import Quit from '@/assets/alarm/quit.svg';
import Remind from '@/assets/alarm/remind.svg';
import WakeUp from '@/assets/alarm/wake-up.svg';
import moment from 'moment';
import { useUpdateAlarmStatus } from '@hooks/alarm/useUpdateAlarmStatus';
import { getTeamById } from '@apis/team/getTeamById';
import { useUpdateAlarmStatus } from '@/hooks/alarm/useUpdateAlarmStatus';
import { getTeamById } from '@/apis/team/getTeamById';
import { useQuery } from '@tanstack/react-query';

type AlarmProps = {
Expand Down
12 changes: 6 additions & 6 deletions src/components/Calendar/AddEventModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import * as Dialog from '@radix-ui/react-dialog';
import moment from 'moment';
import ParticipantsList from './ParticipantsList';
import { AddEventModalProps, ScheduleInfoType } from '../../types/calendar';
import ClosedBtn from '@assets/calendar/closed-btn.svg';
import RemoveTagIcon from '@assets/calendar/remove-tag-icon.svg';
import { createCalendarEvent } from '@apis/calendar';
import { syncCalendarEvent } from '@utils/calendarUtils';
import { useCalendarStore } from '@store/calendarStore';
import { useIdStore } from '@store/idStore';
import ClosedBtn from '@/assets/calendar/closed-btn.svg';
import RemoveTagIcon from '@/assets/calendar/remove-tag-icon.svg';
import { createCalendarEvent } from '@/apis/calendar';
import { syncCalendarEvent } from '@/utils/calendarUtils';
import { useCalendarStore } from '@/store/calendarStore';
import { useIdStore } from '@/store/idStore';

const AddEventModal = ({ selectedDate, open, setOpen }: AddEventModalProps) => {
const { teamId, setTeamId } = useIdStore((state) => ({
Expand Down
4 changes: 2 additions & 2 deletions src/components/Calendar/Event.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useEffect, useState } from 'react';
import styled from 'styled-components';
import { EventType } from 'src/types/calendar';
import CheckedIcon from '@assets/todo-list/checked.svg';
import { updateEventState } from '@apis/calendar';
import CheckedIcon from '@/assets/todo-list/checked.svg';
import { updateEventState } from '@/apis/calendar';
import EventModal from './EventModal';

type EventProp = {
Expand Down
14 changes: 7 additions & 7 deletions src/components/Calendar/EventCalendar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import Calendar from 'react-calendar';
import 'react-calendar/dist/Calendar.css';
import moment from 'moment';
import { EventType, Value } from '../../types/calendar';
import NextBtn from '@assets/calendar/next-btn.svg';
import PrevBtn from '@assets/calendar/prev-btn.svg';
import { useMemberStore } from '@store/memberStore';
import { useCalendarStore } from '@store/calendarStore';
import { getTeamMember } from '@apis/calendar';
import NextBtn from '@/assets/calendar/next-btn.svg';
import PrevBtn from '@/assets/calendar/prev-btn.svg';
import { useMemberStore } from '@/store/memberStore';
import { useCalendarStore } from '@/store/calendarStore';
import { getTeamMember } from '@/apis/calendar';
import EventPopover from './EventPopover';
import { syncCalendarEvent } from '@utils/calendarUtils';
import { useIdStore } from '@store/idStore';
import { syncCalendarEvent } from '@/utils/calendarUtils';
import { useIdStore } from '@/store/idStore';

const EventCalendar = () => {
const { teamId, setTeamId } = useIdStore((state) => ({
Expand Down
12 changes: 6 additions & 6 deletions src/components/Calendar/EventModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ import * as Dialog from '@radix-ui/react-dialog';
import moment from 'moment';
import ParticipantsList from './ParticipantsList';
import { ScheduleInfoType } from '../../types/calendar';
import ClosedBtn from '@assets/calendar/closed-btn.svg';
import RemoveTagIcon from '@assets/calendar/remove-tag-icon.svg';
import ClosedBtn from '@/assets/calendar/closed-btn.svg';
import RemoveTagIcon from '@/assets/calendar/remove-tag-icon.svg';
import {
deleteCalendarEvent,
getCalendarEventDetail,
updateCalendarEvent,
updateEventState
} from '@apis/calendar';
import { syncCalendarEvent } from '@utils/calendarUtils';
} from '@/apis/calendar';
import { syncCalendarEvent } from '@/utils/calendarUtils';
import { EventProps } from '../../types/calendar';
import { useCalendarStore } from '@store/calendarStore';
import { useIdStore } from '@store/idStore';
import { useCalendarStore } from '@/store/calendarStore';
import { useIdStore } from '@/store/idStore';

const EventModal = ({
date,
Expand Down
6 changes: 3 additions & 3 deletions src/components/Calendar/EventPopover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import moment from 'moment';
import * as Popover from '@radix-ui/react-popover';
import AddEventModal from './AddEventModal';
import { EventType } from 'src/types/calendar';
import AddEventButton from '@assets/calendar/add-event-btn.svg';
import AddEventButton from '@/assets/calendar/add-event-btn.svg';
import { useState } from 'react';
import Event from './Event';

Expand All @@ -28,8 +28,8 @@ const EventPopover = ({ date, eventList }: EventPopoverProps) => {
<PopoverContent>
<h4 className="date">{moment(date).format('YYYY-MM-DD')}</h4>
<ul className="event-list">
{eventList.map((event) => {
return <Event event={event} />;
{eventList.map((event, index) => {
return <Event key={index} event={event} />;
})}
</ul>
<button
Expand Down
6 changes: 3 additions & 3 deletions src/components/Calendar/ParticipantsList.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as Popover from '@radix-ui/react-popover';
import styled from 'styled-components';
import { useMemberStore } from '@store/memberStore';
import { useMemberStore } from '@/store/memberStore';
import { ParticipantsListType, TeamMemberType } from 'src/types/calendar';
import AddParticipantsBtn from '@assets/calendar/add-participants.svg';
import AddParticipantsBtn from '@/assets/calendar/add-participants.svg';

const ParticipantsList = ({
scheduleInfo,
Expand Down Expand Up @@ -94,7 +94,7 @@ const Button = styled.button`
}
`;

const StyledAddParticipantsBtn = styled(AddParticipantsBtn)<{}>`
const StyledAddParticipantsBtn = styled(AddParticipantsBtn)<object>`
position: sticky;
top: 0;
right: 5px;
Expand Down
8 changes: 4 additions & 4 deletions src/components/Calendar/UpcomingEventList.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { useEffect } from 'react';
import styled from 'styled-components';
import UpcomingEvent from '@components/Calendar/UpcomingEvent';
import { getUpcomingEvent } from '@apis/calendar';
import UpcomingEvent from '@/components/Calendar/UpcomingEvent';
import { getUpcomingEvent } from '@/apis/calendar';
// import { teamId } from '../../constant/index';
import { useCalendarStore } from '@store/calendarStore';
import { useIdStore } from '@store/idStore';
import { useCalendarStore } from '@/store/calendarStore';
import { useIdStore } from '@/store/idStore';

const UpcomingEventList = () => {
const { teamId } = useIdStore((state) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useLocation } from 'react-router-dom';
import { ReactNode } from 'react';
import { SideBar } from '@components/SideBar/SideBar';
import { SideBar } from '@/components/SideBar/SideBar';

type LayoutProps = {
children: ReactNode;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Login/Complete.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import OnBoardingWrapper from '@components/Login/OnBoardingWrapper';
import CompleteImage from '@assets/login/complete.svg';
import OnBoardingWrapper from '@/components/Login/OnBoardingWrapper';
import CompleteImage from '@/assets/login/complete.svg';
import styled from 'styled-components';
import { useNavigate } from 'react-router-dom';

Expand Down
8 changes: 4 additions & 4 deletions src/components/Login/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from 'styled-components';
import LogoImage from '@assets/login/project-logo.svg';
import KakaoLogo from '@assets/login/kakao-logo.svg';
import NaverLogo from '@assets/login/naver-logo.svg';
import GoogleLogo from '@assets/login/google-logo.svg';
import LogoImage from '@/assets/login/project-logo.svg';
import KakaoLogo from '@/assets/login/kakao-logo.svg';
import NaverLogo from '@/assets/login/naver-logo.svg';
import GoogleLogo from '@/assets/login/google-logo.svg';

const Login = () => {
const handleKakaoButtonClick = () => {
Expand Down
6 changes: 3 additions & 3 deletions src/components/Login/OnBoarding.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import OnBoardingWrapper from '@components/Login/OnBoardingWrapper';
import Signup from '@components/SignUp/Signup';
import Login from '@components/Login/Login';
import OnBoardingWrapper from '@/components/Login/OnBoardingWrapper';
import Signup from '@/components/SignUp/Signup';
import Login from '@/components/Login/Login';

interface OnBoardingProps {
type: 'signin' | 'signup';
Expand Down
6 changes: 3 additions & 3 deletions src/components/Login/OnBoardingWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { Swiper as SwiperType } from 'swiper/types';
import { Autoplay } from 'swiper/modules';
import 'swiper/css';
import 'swiper/css/autoplay';
import firstSwiperImage from '@assets/login/onboarding-frame-1.png';
import secondSwiperImage from '@assets/login/onboarding-frame-2.png';
import thirdSwiperImage from '@assets/login/onboarding-frame-3.png';
import firstSwiperImage from '@/assets/login/onboarding-frame-1.png';
import secondSwiperImage from '@/assets/login/onboarding-frame-2.png';
import thirdSwiperImage from '@/assets/login/onboarding-frame-3.png';

interface OnBoardingProps {
children: React.ReactNode;
Expand Down
8 changes: 4 additions & 4 deletions src/components/Main/Notice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import React, { ChangeEvent, useEffect, useState } from 'react';
import moment from 'moment';
import styled from 'styled-components';
import * as Dialog from '@radix-ui/react-dialog';
import LouderSpeakerIcon from '@assets/main/loud-speaker.svg';
import PublishNoticeIcon from '@assets/main/publish-notice.svg';
import { createNotice, getNoticeList, getNoticeRecent } from '@apis/main';
import LouderSpeakerIcon from '@/assets/main/loud-speaker.svg';
import PublishNoticeIcon from '@/assets/main/publish-notice.svg';
import { createNotice, getNoticeList, getNoticeRecent } from '@/apis/main';
import { NoticeListType } from 'src/types/matin';
import { useIdStore } from '@store/idStore';
import { useIdStore } from '@/store/idStore';

const Notice = () => {
const { teamId, setTeamId } = useIdStore((state) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/components/Management/end-project/CommentInput.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import Profile from '@assets/management/default-profile.svg';
import Profile from '@/assets/management/default-profile.svg';

export const CommentInputBox = () => {
return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/Management/end-project/Comments.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import { CommentInputBox } from '@components/Management/end-project/CommentInput.tsx';
import { CommentInputBox } from '@/components/Management/end-project/CommentInput.tsx';

export const Comments = () => {
return (
Expand Down
6 changes: 3 additions & 3 deletions src/components/Management/end-project/EndProject.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import styled from 'styled-components';
import People from '@assets/management/people.svg';
import End from '@assets/management/end-icon.svg';
import People from '@/assets/management/people.svg';
import End from '@/assets/management/end-icon.svg';
import { useState } from 'react';
import { EndProjectModal } from '@components/Management/end-project/EndProjectModal.tsx';
import { EndProjectModal } from '@/components/Management/end-project/EndProjectModal.tsx';

export const EndProject = () => {
const [showModal, setShowModal] = useState<boolean>(false);
Expand Down
10 changes: 5 additions & 5 deletions src/components/Management/member/Member.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import styled from 'styled-components';
import DefaultProfileImg from '@assets/management/profile-img-default.svg';
import Add from '@assets/management/add-icon.svg';
import { useTags } from '@hooks/useTags.ts';
import DefaultProfileImg from '@/assets/management/profile-img-default.svg';
import Add from '@/assets/management/add-icon.svg';
import { useTags } from '@/hooks/useTags.ts';
import {
TagInputContainer,
DeleteBtn
} from '@components/Management/team-code/TeamCode.tsx';
} from '@/components/Management/team-code/TeamCode.tsx';
import { Role } from '../../../types/member.ts';
import {
createRoleTag,
deleteRoleTag,
updateRoleTag
} from '@apis/management.ts';
} from '@/apis/management.ts';

interface MemberProps {
teamManageId: number;
Expand Down
8 changes: 4 additions & 4 deletions src/components/Management/member/Members.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from 'styled-components';
import { TitleText } from '@components/Management/team-code/TeamCode.tsx';
import { Member } from '@components/Management/member/Member.tsx';
import { TitleText } from '@/components/Management/team-code/TeamCode.tsx';
import { Member } from '@/components/Management/member/Member.tsx';
import { useEffect, useState } from 'react';
import { getMembers } from '@apis/management.ts';
import { getMembers } from '@/apis/management.ts';
import { MemberTypes } from '../../../types/member.ts';
import { useIdStore } from '@store/idStore.ts';
import { useIdStore } from '@/store/idStore.ts';

export const Members = () => {
const [members, setMembers] = useState<MemberTypes[]>([]);
Expand Down
10 changes: 5 additions & 5 deletions src/components/Management/schedule/AddSchedule.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import {
TimeSelector,
TimeSlot
} from '@components/Management/schedule/TimeSelector.tsx';
import Reset from '@assets/management/reset.svg';
import Submit from '@assets/management/submit.svg';
} from '@/components/Management/schedule/TimeSelector.tsx';
import Reset from '@/assets/management/reset.svg';
import Submit from '@/assets/management/submit.svg';
import styled from 'styled-components';
import { useEffect, useState } from 'react';
import {
createSchedule,
deleteSchedule,
updateSchedule
} from '@apis/management.ts';
} from '@/apis/management.ts';
import { ScheduleDto } from '../../../types/management.ts';
import { convertTimeTableToTimeSlots } from '@components/Management/schedule/ShowSchedule.tsx';
import { convertTimeTableToTimeSlots } from '@/components/Management/schedule/ShowSchedule.tsx';

interface DayTimeSlots {
// 요일: 값(TimeSlot[] 형태)
Expand Down
10 changes: 5 additions & 5 deletions src/components/Management/schedule/Schedule.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from 'styled-components';
import Add from '@assets/management/add-button.svg';
import Delete from '@assets/management/delete-icon.svg';
import { TitleText } from '@components/Management/team-code/TeamCode.tsx';
import Add from '@/assets/management/add-button.svg';
import Delete from '@/assets/management/delete-icon.svg';
import { TitleText } from '@/components/Management/team-code/TeamCode.tsx';
import { ButtonHTMLAttributes, useEffect, useRef, useState } from 'react';
import { PeopleDropDown } from '@components/Management/schedule/PeopleDropDown.tsx';
import { getMembers } from '@apis/management.ts';
import { PeopleDropDown } from '@/components/Management/schedule/PeopleDropDown.tsx';
import { getMembers } from '@/apis/management.ts';
import { MemberTypes } from '../../../types/member.ts';

interface ScheduleProps {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Management/schedule/ShowSchedule.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from 'styled-components';
import { SwungDash } from '@components/Management/schedule/TimeSelector.tsx';
import { SwungDash } from '@/components/Management/schedule/TimeSelector.tsx';
import { ScheduleDto } from '../../../types/management.ts';

interface ShowScheduleProps {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Management/schedule/TimeSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from 'styled-components';
import { ButtonHTMLAttributes, useEffect, useState } from 'react';
import Add from '@assets/management/add-button.svg';
import Add from '@/assets/management/add-button.svg';

const generateTimeOptions = (): string[] => {
const options: string[] = [];
Expand Down
Loading

0 comments on commit f76f856

Please sign in to comment.