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
8 changes: 4 additions & 4 deletions apps/web/app/(seats)/_components/SeatButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import { type SeatStatus } from "@repo/types";
import useIsMobileStore from "@/app/store/useIsMobileStore";
import Sidebar from "@/components/common/Sidebar";
import { useDateStore } from "@/app/store/useDateStore";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { isSeat, isSeatReserved } from "@/src/utils/seats";
import { useAuthStore } from "@/app/store/useAuthStore";
import { isSeat, isSeatReserved } from "@/app/utils/seats";
import { useSeatReservation } from "@/app/_hooks/useSeatReservation";
import { notify } from "@/app/store/useToastStore";
import { useSeatContext } from "../../../src/contexts/SeatContext";
import { useSeatContext } from "../../context/SeatContext";
import AdminSeatSetting from "./AdminSeatSetting";
import SeatCancelIcon from "./SeatCancelIcon";

Expand Down Expand Up @@ -166,7 +166,7 @@ export default function SeatButton({
}

return (
<span className="relative group">
<span className="group relative">
<button
type="button"
onClick={isAdmin ? handleAdminButtonClick : handleButtonClick}
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/(seats)/_components/SeatGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { formatSelectedDate } from "@ui/src/utils/date";
import { useDateStore } from "@/app/store/useDateStore";
import { getAllSeats } from "@/api/items";
import { getReservedSeats } from "@/api/reservation";
import { SeatProvider } from "../../../src/contexts/SeatContext";
import { SeatProvider } from "../../context/SeatContext";
import SeatBlock from "./SeatBlock";

export default function SeatGrid(): JSX.Element {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/_components/AuthGuard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useEffect, useState } from "react";
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import { useRouter } from "next/navigation";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import SignInForm from "./SignInForm";

export default function AuthGuard(): JSX.Element | null {
Expand Down
4 changes: 2 additions & 2 deletions apps/web/app/_hooks/useSignInMutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import { delay } from "es-toolkit";
import { notify } from "@/app/store/useToastStore";
import { postSignIn } from "@/api/auth";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { notifyMutationError } from "@/src/utils/notifyMutationError";
import { useAuthStore } from "@/app/store/useAuthStore";
import { notifyMutationError } from "@/app/utils/notifyMutationError";

export const useSignInMutation = (): UseMutationResult<
SignInResponseType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import ErrorResetBoundary from "@/components/common/ErrorResetBoundary";
import ErrorFallback from "@/components/common/Fallback";
import { useRedirectOnMobile } from "@/src/hooks/useRediectOnMobile";
import { useRedirectOnMobile } from "@/app/_hooks/useRediectOnMobile";
import MembersContent from "./MembersContent";

export default function ResponsiveMembersPage(): JSX.Element {
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/admin/members/_hooks/useMembersMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import axios, { type AxiosError } from "axios";
import type { ResponseWithMessage } from "@repo/types/src/membersType";
import { postMember, patchMember, deleteMember } from "@/api/members";
import { notify } from "@/app/store/useToastStore";
import { notifyMutationError } from "@/src/utils/notifyMutationError";
import { notifyMutationError } from "@/app/utils/notifyMutationError";
import { QUERY_KEYS } from "@/lib/queryKey";

interface UpdateMemberParams {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { Suspense } from "react";
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import { useRedirectOnMobile } from "@/src/hooks/useRediectOnMobile";
import { useRedirectOnMobile } from "@/app/_hooks/useRediectOnMobile";
import ErrorResetBoundary from "@/components/common/ErrorResetBoundary";
import ErrorFallback from "@/components/common/Fallback";
import TeamListHeader from "./TeamListHeader";
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/admin/teams/_hooks/useTeamsMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { type ResponseType, type ITeam, type TeamType, type MessageResponse } fr
import { useRef } from "react";
import { deleteTeam, postCreateTeam, updateTeamName, updateTeamOrder } from "@/api/teams";
import { notify } from "@/app/store/useToastStore";
import { notifyMutationError } from "@/src/utils/notifyMutationError";
import { notifyMutationError } from "@/app/utils/notifyMutationError";
import { QUERY_KEYS } from "@/lib/queryKey";
import { useDebouncedCallback } from "./useDebounceCallback";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createContext, useContext, useState, type ReactNode, useMemo } from "re
import { useQuery } from "@tanstack/react-query";
import { type IReservation } from "@repo/types";
import { getUserReservations } from "@/api/reservation";
import { useAuthStore } from "../stores/useAuthStore";
import { useAuthStore } from "../store/useAuthStore";

interface SeatContextType {
checkedSeat: string | null;
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/dashboard/_components/DashboardProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { type IReservation } from "@repo/types";
import { useRouter } from "next/navigation";
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import { getUserReservations } from "@/api/reservation";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import DashboardSection from "./DashboardSection";
import DashboardSectionLoading from "./DashboardSectionLoading";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useQuery } from "@tanstack/react-query";
import { format, parse, differenceInMinutes, addMinutes } from "date-fns";
import { type TBaseItem, type IReservation } from "@repo/types";
import { Button } from "@ui/index";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import { useDateStore } from "@/app/store/useDateStore";
import { getAllItems } from "@/api/items";
import { getReservationsByTypeAndDate, type CreateReservationRequest } from "@/api/reservations";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
updateReservation,
type CreateReservationRequest,
} from "@/api/reservations";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import { useDateStore } from "@/app/store/useDateStore";
import { MEETING_ROOMS_TYPE } from "@/app/constants/meetingRoomsType";
import { formatDate } from "@/app/utils/formatDate";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { useEffect, useState } from "react";
import { type IReservation } from "@repo/types";
import { useSidebarStore } from "@/app/store/useSidebarStore";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";

interface ScheduleSlotProps {
index: number;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Suspense } from "react";
import { useRouter } from "next/navigation";
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
// import ProfileInfo from "./ProfileInfo";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import { notify } from "@/app/store/useToastStore";
import ErrorResetBoundary from "@/components/common/ErrorResetBoundary";
import ErrorFallback from "@/components/common/Fallback";
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/settings/_hooks/useUserMutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useMutation, useQueryClient, type UseMutationResult } from "@tanstack/r
import { type AxiosError } from "axios";
import { patchUserImage, patchUserPassword } from "@/api/users";
import { notify } from "@/app/store/useToastStore";
import { notifyMutationError } from "@/src/utils/notifyMutationError";
import { notifyMutationError } from "@/app/utils/notifyMutationError";
import { QUERY_KEYS } from "@/lib/queryKey";

export const useChangeUserPasswordMutation = (): UseMutationResult<
Expand Down
2 changes: 1 addition & 1 deletion apps/web/app/settings/_hooks/useUserSettingOptions.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ModalComponentType, type SettingsModalProps } from "@ui/src/types/ModalType";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import ChangePasswordModal from "../_components/modals/ChangePasswordModal";
import MembersSettingModal from "../_components/modals/MembersSettingModal";
import TeamSettingModal from "../_components/modals/TeamSettingModal";
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/web/components/Gnb/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import Link from "next/link";
import { PAGE_NAME } from "@ui/src/utils/constants/pageNames";
import { useAuthStore } from "@/src/stores/useAuthStore";
import { useAuthStore } from "@/app/store/useAuthStore";
import Profile from "../common/Profile";
import GnbMenu from "./GnbMenu";
import GnbLogo from "./GnbLogo";
Expand Down
Empty file removed apps/web/src/constants/.gitkeep
Empty file.
Empty file removed apps/web/src/contexts/.gitkeep
Empty file.
Empty file removed apps/web/src/mocks/.gitkeep
Empty file.
Empty file removed apps/web/src/types/.gitkeep
Empty file.
Loading