Compare commits

...

14 Commits

Author SHA1 Message Date
2c8dcf9db7 issue #60
All checks were successful
Test CI / build (push) Successful in 17s
- 일정 등록 및 조회 컴포넌트 설계 및 구현 중
2025-12-06 00:19:25 +09:00
geonhee-min
4a8e761b3d issue #60
All checks were successful
Test CI / build (push) Successful in 18s
- 날짜 선택 및 해당 날짜 일정 조회 화면 구현 중
2025-12-05 17:10:58 +09:00
0c8e0893c7 issue #60
All checks were successful
Test CI / build (push) Successful in 17s
- 일정 등록 및 조회 컴포넌트 설계 및 구현 중
2025-12-05 00:05:33 +09:00
geonhee-min
7df60fe004 issue #60
All checks were successful
Test CI / build (push) Successful in 17s
- 캘린더 ui 구현 중
2025-12-04 17:00:02 +09:00
daab622638 issue #59
All checks were successful
Test CI / build (push) Successful in 17s
- 일정 메인 화면 구현 중
2025-12-03 22:51:13 +09:00
geonhee-min
ea7861b63a issue #
All checks were successful
Test CI / build (push) Successful in 17s
- 로그인 화면, 회원가입 화면, 비밀번호 초기화 화면 모바일 ui 대비 작업
2025-12-03 17:06:20 +09:00
geonhee-min
069f58075b issue #52
- 사이드바 Sheet 스타일로 변경
- 로그아웃 버튼 구현
2025-12-03 17:05:48 +09:00
geonhee-min
edef4273c0 issue #48
- 홈 화면 및 전체적 ui 수정
2025-12-03 17:05:19 +09:00
geonhee-min
e3091494b1 issue #32
- 새로고침 시 로그인 해제 오류 해결 및 자동로그인 기능 구현
2025-12-03 12:59:08 +09:00
geonhee-min
3859099074 issue #32
- 로그인 토스트 동작 오류 개선
2025-12-03 11:20:33 +09:00
geonhee-min
54c84dbc87 issue #
Enter키 동작 구현
2025-12-03 10:13:37 +09:00
1a0cc9376f issue #49
All checks were successful
Test CI / build (push) Successful in 16s
- 홈 화면 라우팅 및 기본 파일 생성
2025-12-02 22:40:04 +09:00
b730945d34 issue #37
- 비밀번호 초기화 화면 기능 구현
2025-12-02 22:39:47 +09:00
17e27fca70 issue #36
- 화면 구현 완료
2025-12-02 22:39:31 +09:00
28 changed files with 1008 additions and 248 deletions

View File

@@ -1 +1 @@
VITE_API_URL=http://localhost:8080 VITE_API_URL=http://localhost:8088

View File

@@ -6,18 +6,42 @@ import { useAuthStore } from './store/authStore';
import { PageRouting } from './const/PageRouting'; import { PageRouting } from './const/PageRouting';
import LoginPage from './ui/page/account/login/LoginPage'; import LoginPage from './ui/page/account/login/LoginPage';
import ResetPasswordPage from './ui/page/account/resetPassword/ResetPasswordPage'; import ResetPasswordPage from './ui/page/account/resetPassword/ResetPasswordPage';
import { HomePage } from './ui/page/home/HomePage';
import type { AuthData } from './data/AuthData';
import { useEffect } from 'react';
import { ScheduleMainPage } from './ui/page/schedule/ScheduleMainPage';
function App() { function App() {
const { authData } = useAuthStore(); const { authData, login } = useAuthStore();
useEffect(() => {
const autoLogin = localStorage.getItem('autoLogin') === 'true';
if (autoLogin) {
const stored = localStorage.getItem('auth-storage');
if (stored) {
const storedAuthData = JSON.parse(stored).state as AuthData;
login(storedAuthData);
}
}
}, []);
return ( return (
<Router> <Router>
<Routes> <Routes>
<Route element={<Layout />}> <Route element={<Layout />}>
{
!authData
? <>
<Route element={<LoginPage />} path={PageRouting["LOGIN"].path} /> <Route element={<LoginPage />} path={PageRouting["LOGIN"].path} />
<Route element={<SignUpPage />} path={PageRouting["SIGN_UP"].path} /> <Route element={<SignUpPage />} path={PageRouting["SIGN_UP"].path} />
<Route element={<ResetPasswordPage />} path={PageRouting["RESET_PASSWORD"].path} /> <Route element={<ResetPasswordPage />} path={PageRouting["RESET_PASSWORD"].path} />
{!authData ? <Route element={<Navigate to={PageRouting["LOGIN"].path} />} path="*" /> : null} <Route element={<Navigate to={PageRouting["LOGIN"].path} />} path="*" />
</>
: <>
<Route element={<Navigate to={PageRouting["HOME"].path} />} path="*" />
<Route element={<HomePage />} path={PageRouting["HOME"].path} />
<Route element={<ScheduleMainPage />} path={PageRouting["SCHEDULES"].path} />
</>
}
</Route> </Route>
</Routes> </Routes>
</Router> </Router>

View File

@@ -10,6 +10,7 @@ import { DayButton, DayPicker, getDefaultClassNames } from "react-day-picker"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { Button, buttonVariants } from "@/components/ui/button" import { Button, buttonVariants } from "@/components/ui/button"
import { format } from "date-fns"
function Calendar({ function Calendar({
className, className,
@@ -36,8 +37,28 @@ function Calendar({
)} )}
captionLayout={captionLayout} captionLayout={captionLayout}
formatters={{ formatters={{
formatCaption: (month) => format(month, "yyyy년 MM월"),
formatWeekdayName: (weekday) => {
switch(weekday.getDay()) {
case 0:
return '일';
case 1:
return '월';
case 2:
return '화';
case 3:
return '수';
case 4:
return '목';
case 5:
return '금';
case 6:
return '토';
}
return '';
},
formatMonthDropdown: (date) => formatMonthDropdown: (date) =>
date.toLocaleString("default", { month: "short" }), date.toLocaleString("", { month: "short" }),
...formatters, ...formatters,
}} }}
classNames={{ classNames={{

View File

@@ -89,9 +89,7 @@ function SidebarProvider({
) )
// Helper to toggle the sidebar. // Helper to toggle the sidebar.
const toggleSidebar = React.useCallback(() => { const toggleSidebar = () => setOpen((open) => !open);
return isMobile ? setOpenMobile((open) => !open) : setOpen((open) => !open)
}, [isMobile, setOpen, setOpenMobile])
// Adds a keyboard shortcut to toggle the sidebar. // Adds a keyboard shortcut to toggle the sidebar.
React.useEffect(() => { React.useEffect(() => {
@@ -157,13 +155,15 @@ function Sidebar({
collapsible = "offcanvas", collapsible = "offcanvas",
className, className,
children, children,
forceSheet = false,
...props ...props
}: React.ComponentProps<"div"> & { }: React.ComponentProps<"div"> & {
side?: "left" | "right" side?: "left" | "right"
variant?: "sidebar" | "floating" | "inset" variant?: "sidebar" | "floating" | "inset"
collapsible?: "offcanvas" | "icon" | "none" collapsible?: "offcanvas" | "icon" | "none",
forceSheet?: boolean
}) { }) {
const { isMobile, state, openMobile, setOpenMobile } = useSidebar() const { isMobile, state, open, setOpen } = useSidebar()
if (collapsible === "none") { if (collapsible === "none") {
return ( return (
@@ -180,14 +180,14 @@ function Sidebar({
) )
} }
if (isMobile) { if (isMobile || forceSheet) {
return ( return (
<Sheet open={openMobile} onOpenChange={setOpenMobile} {...props}> <Sheet open={open} onOpenChange={setOpen} {...props}>
<SheetContent <SheetContent
data-sidebar="sidebar" data-sidebar="sidebar"
data-slot="sidebar" data-slot="sidebar"
data-mobile="true" data-mobile="true"
className="bg-sidebar text-sidebar-foreground w-(--sidebar-width) p-0 [&>button]:hidden" className="bg-sidebar text-sidebar-foreground rounded-br-2xl rounded-tr-2xl w-(--sidebar-width) p-0 [&>button]:hidden"
style={ style={
{ {
"--sidebar-width": SIDEBAR_WIDTH_MOBILE, "--sidebar-width": SIDEBAR_WIDTH_MOBILE,

99
src/const/ColorPalette.ts Normal file
View File

@@ -0,0 +1,99 @@
export type ColorPaletteType = {
index: number;
style: string;
main: boolean;
}
export const ColorPalette: Record<any, ColorPaletteType> = {
Black: {
index: 0,
style: '#000000',
main: true
},
White: {
index: 1,
style: '#FFFFFF',
main: true
},
PeachCream: {
index: 2,
style: '#FFDAB9',
main: false
},
CoralPink: {
index: 3,
style: '#F08080',
main: true
},
MintIcing: {
index: 4,
style: '#C1E1C1',
main: false
},
Vanilla: {
index: 5,
style: '#FFFACD',
main: true
},
Wheat: {
index: 6,
style: '#F5DEB3',
main: false
},
AliceBlue: {
index: 7,
style: '#F0F8FF',
main: true
},
Lavender: {
index: 8,
style: '#E6E6FA',
main: false
},
LightAqua: {
index: 9,
style: '#A8E6CF',
main: true
},
CloudWhite: {
index: 10,
style: '#F0F8FF',
main: false
},
LightGray: {
index: 11,
style: '#D3D3D3',
main: true
},
LightKhakki: {
index: 12,
style: '#F0F8E6',
main: false
},
DustyRose: {
index: 13,
style: '#D8BFD8',
main: true
},
CreamBeige: {
index: 14,
style: '#FAF0E6',
main: true,
},
Oatmeal: {
index: 15,
style: '#FDF5E6',
main: false
},
CharcoalLight: {
index: 16,
style: '#A9A9A9',
main: true
},
Custom: {
index: 17,
style: 'transparent',
main: false
},
}

View File

@@ -1,11 +1,20 @@
import { Validator } from '@/util/Validator';
import * as z from 'zod'; import * as z from 'zod';
export const LoginSchema = z.object({ export const LoginSchema = z.object({
id: z id: z
.string() .string()
.refine((val) => {
if (val.includes('@')) {
return Validator.isEmail(val);;
}
return true;
}, {
message: "이메일 형식이 올바르지 않습니다."
})
, password: z , password: z
.string() .string()
.min(8, "비밀번호는 8-12 자리여야 합니다.") .min(8, "비밀번호는 8-12 자리여야 합니다.")
.max(12, "비밀번호는 8-12 자리여야 합니다.") .max(12, "비밀번호는 8-12 자리여야 합니다.")
.regex(/^[a-z](?=.*[0-9])(?=.*[!@#$]).*$/, "비밀번호는 영소문자로 시작하여 숫자, 특수문자(!@#$)를 한 개 이상 포함하여야 합니다.") .regex(/^(?=.*[0-9])(?=.*[!@#$%^])[a-zA-Z0-9!@#$%^]+$/, "비밀번호는 영소문자로 시작하여 숫자, 특수문자(!@#$)를 한 개 이상 포함하여야 합니다.")
}); });

View File

@@ -6,12 +6,12 @@ export const ResetPasswordSchema = z.object({
, code: z , code: z
.string() .string()
.length(8) .length(8)
.regex(/^[a-z](?=.*[0-9])(?=.*[!@#$%^]).*$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.") .regex(/^(?=.*[0-9])(?=.*[!@#$%^])[a-zA-Z0-9!@#$%^]+$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.")
, password: z , password: z
.string() .string()
.min(8, "비밀번호는 8-12 자리여야 합니다.") .min(8, "비밀번호는 8-12 자리여야 합니다.")
.max(12, "비밀번호는 8-12 자리여야 합니다.") .max(12, "비밀번호는 8-12 자리여야 합니다.")
.regex(/^[a-z](?=.*[0-9])(?=.*[!@#$%^]).*$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.") .regex(/^(?=.*[0-9])(?=.*[!@#$%^])[a-zA-Z0-9!@#$%^]+$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.")
, passwordConfirm: z , passwordConfirm: z
.string() .string()
}) })

View File

@@ -4,6 +4,11 @@ export const SignUpSchema = z.object({
accountId: z accountId: z
.string() .string()
.min(5, "아이디는 5 자리 이상이어야 합니다.") .min(5, "아이디는 5 자리 이상이어야 합니다.")
.refine((val) => {
return /^[a-zA-z-_.]*$/.test(val);
}, {
message: "영문, 숫자, '- _ .' 를 제외한 문자를 사용할 수 없습니다."
})
, email: z , email: z
.string() .string()
.min(5, "이메일을 입력해주십시오.") .min(5, "이메일을 입력해주십시오.")
@@ -11,7 +16,7 @@ export const SignUpSchema = z.object({
.string() .string()
.min(8, "비밀번호는 8-12 자리여야 합니다.") .min(8, "비밀번호는 8-12 자리여야 합니다.")
.max(12, "비밀번호는 8-12 자리여야 합니다.") .max(12, "비밀번호는 8-12 자리여야 합니다.")
.regex(/^[a-z](?=.*[0-9])(?=.*[!@#$%^]).*$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.") .regex(/^(?=.*[0-9])(?=.*[!@#$%^])[a-zA-Z0-9!@#$%^]+$/, "영소문자로 시작하고 숫자와 특수문자(!@#$%^)를 포함해야 합니다.")
, name: z , name: z
.string() .string()
.min(1, "이름을 입력해주시십시오.") .min(1, "이름을 입력해주시십시오.")

67
src/hooks/use-palette.ts Normal file
View File

@@ -0,0 +1,67 @@
import { ColorPalette, type ColorPaletteType } from "@/const/ColorPalette";
export function usePalette() {
const ColorPaletteType = typeof ColorPalette;
const getPaletteNameList = () => {
return Object.keys(ColorPalette);
}
const getMainPaletteList = () => {
const paletteKeys = Object.keys(ColorPalette);
let paletteList: ColorPaletteType[] = [];
paletteKeys.forEach((paletteKey) => {
const key = paletteKey as keyof typeof ColorPalette;
const palette: ColorPaletteType = ColorPalette[key];
if (palette.main) {
paletteList.push(palette);
}
});
paletteList = paletteList.sort((a, b) => a.index - b.index);
return paletteList;
}
const getExtraPaletteList = () => {
const paletteKeys = Object.keys(ColorPalette);
let paletteList: ColorPaletteType[] = [];
paletteKeys.forEach((paletteKey) => {
const key = paletteKey as keyof typeof ColorPalette;
const palette: ColorPaletteType = ColorPalette[key];
if (!palette.main) {
paletteList.push(palette);
}
});
paletteList = paletteList.sort((a, b) => a.index - b.index);
return paletteList;
}
const getAllPaletteList = [...getMainPaletteList(), ...getExtraPaletteList()].sort((a, b) => a.index - b.index);
const getPaletteByKey = (key: keyof typeof ColorPalette) => {
return ColorPalette[key];
}
const getCustomColor = (style: string) => {
return {
style: `#${style}`,
main: false
} as ColorPaletteType;
}
const getStyle = (palette: ColorPaletteType) => {
return palette.style;
}
return {
ColorPaletteType,
getPaletteNameList,
getMainPaletteList,
getExtraPaletteList,
getAllPaletteList,
getPaletteByKey,
getCustomColor,
getStyle
}
}

27
src/hooks/use-viewport.ts Normal file
View File

@@ -0,0 +1,27 @@
import { useState, useEffect } from 'react';
const useViewport = () => {
const [width, setWidth] = useState(
typeof window !== 'undefined' ? window.innerWidth : 0
);
const [height, setHeight] = useState(
typeof window !== 'undefined' ? window.innerHeight : 0
);
useEffect(() => {
const handleResize = () => {
setWidth(window.innerWidth);
setHeight(window.innerHeight);
window.addEventListener('resize', handleResize);
return () => {
window.removeEventListener('resize', handleResize);
};
}
}, []);
return { width, height };
}
export default useViewport;

View File

@@ -120,7 +120,11 @@
} }
html, body, #root { html, body, #root {
width: 100%;
height: 100%; height: 100%;
min-width: 1280px;
min-height: 720px;
max-height: 1080px;
} }
/* Chrome, Safari, Edge */ /* Chrome, Safari, Edge */
@@ -130,7 +134,19 @@ input[type="number"]::-webkit-outer-spin-button {
margin: 0; margin: 0;
} }
.rdp-day {
aspect-ratio: unset;
}
/* Firefox */ /* Firefox */
input[type="number"] { input[type="number"] {
-moz-appearance: textfield; -moz-appearance: textfield;
} }
.rdp-week:not(:first-child) {
@apply border-t;
}
.rdp-day:not(:first-child) {
@apply border-l;
}

View File

@@ -1,5 +1,5 @@
import SideBar from "@/ui/component/SideBar"; import SideBar from "@/ui/component/SideBar";
import { Outlet } from "react-router-dom"; import { Outlet, useNavigate } from "react-router-dom";
import { SidebarProvider } from "@/components/ui/sidebar"; import { SidebarProvider } from "@/components/ui/sidebar";
import Header from "@/ui/component/Header"; import Header from "@/ui/component/Header";
import { useAuthStore } from '@/store/authStore'; import { useAuthStore } from '@/store/authStore';
@@ -11,9 +11,22 @@ import {
OctagonXIcon, OctagonXIcon,
TriangleAlertIcon, TriangleAlertIcon,
} from "lucide-react"; } from "lucide-react";
import { useState } from "react";
export default function Layout() { export default function Layout() {
const { authData } = useAuthStore(); const { authData } = useAuthStore();
const [open, setOpen] = useState(false);
const navigate = useNavigate();
const pathname = location.pathname;
const goTo = (path: string) => {
console.log(path);
console.log(pathname);
if (path === pathname) return;
navigate(path);
setOpen(false);
}
return ( return (
<> <>
<Toaster <Toaster
@@ -27,15 +40,17 @@ export default function Layout() {
}} }}
/> />
<SidebarProvider <SidebarProvider
defaultOpen={false} open={open}
onOpenChange={setOpen}
id="root" id="root"
> >
<SideBar /> <SideBar goTo={goTo} />
<div className="flex flex-col w-full h-full"> <div className="flex flex-col w-full h-full">
{ authData ? <Header /> : null} { authData ? <Header /> : null}
{/* <Header /> */} <div className="w-full h-full p-2.5">
<Outlet /> <Outlet />
</div> </div>
</div>
</SidebarProvider> </SidebarProvider>
</> </>
); );

View File

@@ -76,21 +76,21 @@ export class AccountNetwork extends BaseNetwork {
async sendResetPasswordCode(data: SendResetPasswordCodeRequest) { async sendResetPasswordCode(data: SendResetPasswordCodeRequest) {
return await this.post<SendResetPasswordCodeResponse>( return await this.post<SendResetPasswordCodeResponse>(
'/send-reset-password-code', this.baseUrl + '/send-reset-password-code',
data data
); );
} }
async verifyResetPasswordCode(data: VerifyResetPasswordCodeRequest) { async verifyResetPasswordCode(data: VerifyResetPasswordCodeRequest) {
return await this.post<VerifyResetPasswordCodeResponse>( return await this.post<VerifyResetPasswordCodeResponse>(
'/verify-reset-password-code', this.baseUrl + '/verify-reset-password-code',
data data
); );
} }
async resetPassword(data: ResetPasswordRequest) { async resetPassword(data: ResetPasswordRequest) {
return await this.post<ResetPasswordResponse>( return await this.post<ResetPasswordResponse>(
'/reset-password', this.baseUrl + '/reset-password',
data data
); );
} }

View File

@@ -7,7 +7,8 @@ import type {
InternalAxiosRequestConfig, InternalAxiosRequestConfig,
} from "axios"; } from "axios";
import { useAuthStore } from '@/store/authStore'; import { useAuthStore } from '@/store/authStore';
import type { RefreshAccessTokenResponse } from '@/data/response/account/RefreshAccessTokenResponse'; import { RefreshAccessTokenResponse } from '@/data/response/account/RefreshAccessTokenResponse';
import type { AuthData } from '@/data/AuthData';
export class BaseNetwork { export class BaseNetwork {
protected instance: AxiosInstance; protected instance: AxiosInstance;
@@ -98,30 +99,16 @@ export class BaseNetwork {
this.isRefreshing = true; this.isRefreshing = true;
try { try {
const response = await this.get<RefreshAccessTokenResponse>( await this.refreshToken();
'/account/refresh-access-token',
{
headers: {
Authorization: `Bearer ${refreshToken}`
}
}
)
const newAccessToken = response.data.accessToken; const newAccessToken = useAuthStore.getState().authData!.accessToken;
const newRefreshToken = response.data.refreshToken;
useAuthStore.getState().login({
...authData,
accessToken: newAccessToken,
refreshToken: newRefreshToken
});
this.refreshQueue.forEach((cb) => cb(newAccessToken)); this.refreshQueue.forEach((cb) => cb(newAccessToken));
this.refreshQueue = []; this.refreshQueue = [];
originalRequest.headers = { originalRequest.headers = {
...originalRequest.headers, ...originalRequest.headers,
Authorization: `Bearer ${newAccessToken}`, Authorization: `Bearer ${newAccessToken}`,
}; } as any;
return this.instance(originalRequest); return this.instance(originalRequest);
} catch (err) { } catch (err) {
@@ -143,4 +130,39 @@ export class BaseNetwork {
protected async post<T = any>(url: string, data?: any, config?: AxiosRequestConfig & { authPass?: boolean }) { protected async post<T = any>(url: string, data?: any, config?: AxiosRequestConfig & { authPass?: boolean }) {
return await this.instance.post<T>(url, data, config); return await this.instance.post<T>(url, data, config);
} }
public async refreshToken() {
const storedAuth = localStorage.getItem('auth-storage');
if (!storedAuth) {
localStorage.setItem('autoLogin', 'false');
throw new Error;
}
const authData: AuthData = JSON.parse(storedAuth).state;
if (!authData || !authData.refreshToken) {
localStorage.setItem('autoLogin', 'false');
throw new Error;
}
const result = await this.get<RefreshAccessTokenResponse>(
'/account/refresh-access-token',
{
headers: {
Authorization: `Bearer ${authData.refreshToken}`
}
}
);
if (!result.data.success) throw new Error;
const newAccessToken = result.data.accessToken;
const newRefreshToken = result.data.refreshToken;
useAuthStore.getState().login({
accessToken: newAccessToken,
refreshToken: newRefreshToken
});
}
} }

View File

@@ -1,5 +1,6 @@
import type { AuthData } from '@/data/AuthData'; import type { AuthData } from '@/data/AuthData';
import { create } from 'zustand'; import { create } from 'zustand';
import { createJSONStorage, persist } from 'zustand/middleware';
interface AuthStoreProps { interface AuthStoreProps {
authData: AuthData | undefined; authData: AuthData | undefined;
@@ -7,17 +8,23 @@ interface AuthStoreProps {
logout: () => void; logout: () => void;
} }
export const useAuthStore = create<AuthStoreProps>((set) => ({ const storage = sessionStorage;
export const useAuthStore = create<AuthStoreProps>()(
persist(
(set) => ({
authData: undefined, authData: undefined,
login: (data: AuthData) => { login: (data: AuthData) => {
set({ authData: data }); set({ authData: data });
Object.entries(data)
.forEach((entry) => {
localStorage.setItem(entry[0], entry[1]);
})
}, },
logout: () => { logout: () => {
localStorage.setItem('autoLogin', 'false');
localStorage.removeItem('auth-storage');
set({ authData: undefined }); set({ authData: undefined });
localStorage.clear();
} }
})); }),
{
name: 'auth-storage',
storage: createJSONStorage(() => storage)
}
)
);

View File

@@ -2,13 +2,53 @@ import { Label } from '@/components/ui/label';
import { SidebarTrigger } from '@/components/ui/sidebar'; import { SidebarTrigger } from '@/components/ui/sidebar';
import { Separator } from '@/components/ui/separator'; import { Separator } from '@/components/ui/separator';
import { useState } from 'react'; import { useState } from 'react';
import { Button } from '@/components/ui/button';
import { useAuthStore } from '@/store/authStore';
import { LogOutIcon } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
import { PageRouting } from '@/const/PageRouting';
export default function Header() { export default function Header() {
const navigate = useNavigate();
const { logout } = useAuthStore();
const handleClickLogoutButton = () => {
logout();
navigate(PageRouting["LOGIN"].path);
}
return ( return (
<header className="flex shrink-0 items-center gap-2 border-b px-4 w-full h-12"> <header className="w-full flex shrink-0 flex-row justify-between items-center border-b px-4 h-12">
<div className="flex flex-row gap-2 items-center">
<SidebarTrigger className="-ml-1" /> <SidebarTrigger className="-ml-1" />
<Separator orientation="vertical" className="mr-2 data-[orientation=vertical]:h-4" /> <Separator orientation="vertical" className="mr-2 data-[orientation=vertical]:h-4" />
<Label>{import.meta.env.BASE_URL}</Label> <Label>{import.meta.env.BASE_URL}</Label>
</div>
<div>
<Button
className={`
group flex items-center justify-start
pr-2 pl-2 border border-red-500 bg-white
transition-all duration-150
w-10 hover:w-25 hover:bg-red-500
overflow-hidden rounded-md
`}
type="button"
onClick={handleClickLogoutButton}
>
<LogOutIcon
className="text-red-500 transition-colors duration-150 group-hover:text-white"
/>
<span className="
text-red-500 group-hover:text-white
opacity-0 scale-1
transition-all duration-150
group-hover:opacity-100 group-hover:scale-100
">
</span>
</Button>
</div>
</header> </header>
); );
} }

View File

@@ -5,11 +5,20 @@ import {
SidebarFooter, SidebarFooter,
SidebarHeader SidebarHeader
} from '@/components/ui/sidebar'; } from '@/components/ui/sidebar';
import { PageRouting } from '@/const/PageRouting';
interface SideBarProps {
goTo: (path: string) => void;
}
export default function SideBar({ goTo } : SideBarProps) {
export default function SideBar() {
return ( return (
<Sidebar> <Sidebar forceSheet={true}>
<SidebarHeader></SidebarHeader>
<SidebarContent className="flex flex-col p-4 cursor-default">
<div onClick={() => goTo(PageRouting["HOME"].path)}>Home</div>
<div onClick={() => goTo(PageRouting["SCHEDULES"].path)}>Schedules</div>
</SidebarContent>
</Sidebar> </Sidebar>
); );
} }

View File

@@ -0,0 +1,190 @@
import { cn } from "@/lib/utils";
import { Calendar } from "@/components/ui/calendar";
import { useLayoutEffect, useRef, useState } from "react";
import { getDefaultClassNames } from "react-day-picker";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { ScrollArea } from "@/components/ui/scroll-area";
import { isSameDay, getWeeksInMonth, getWeekOfMonth } from "date-fns";
import { SchedulePopover } from "../popover/SchedulePopover";
interface CustomCalendarProps {
data?: any;
}
export const CustomCalendar = ({ data }: CustomCalendarProps) => {
const [weekCount, setWeekCount] = useState(5);
const [selectedDate, setSelectedDate] = useState<Date | undefined>(undefined);
const [popoverOpen, setPopoverOpen] = useState(false);
const [popoverSide, setPopoverSide] = useState<'right' | 'left'>('right');
const [popoverAlign, setPopoverAlign] = useState<'start' | 'end'>('end');
const defaultClassNames = getDefaultClassNames();
const containerRef = useRef<HTMLDivElement>(null);
const updateWeekCount = () => {
if (containerRef === null) return;
if (!containerRef.current) return;
const weeks = containerRef.current.querySelectorAll('.rdp-week');
if (weeks?.length) setWeekCount(weeks.length);
}
useLayoutEffect(() => {
updateWeekCount();
}, []);
const handleOpenChange = (open: boolean) => {
setPopoverOpen(open);
if (!open) {
setTimeout(() => {
setSelectedDate(undefined);
}, 150);
}
}
const handleDaySelect = (date: Date | undefined) => {
if (!date) {
setPopoverOpen(false);
setTimeout(() => {
setSelectedDate(undefined);
}, 150);
return;
}
if (date) {
setSelectedDate(date);
const dayOfWeek = date.getDay();
if (0 <= dayOfWeek && dayOfWeek < 4) {
setPopoverSide('right');
} else {
setPopoverSide('left');
}
const options = { weekStartsOn: 0 as 0 };
const totalWeeks = getWeeksInMonth(date, options);
const currentWeekNumber = getWeekOfMonth(date, options);
const threshold = Math.ceil(totalWeeks / 2);
if (currentWeekNumber <= threshold) {
setPopoverAlign('start');
} else {
setPopoverAlign('end');
}
requestAnimationFrame(() => {
setPopoverOpen(true);
})
}
}
return (
<div
className="w-full h-full"
ref={containerRef}
>
<Popover
open={popoverOpen}
onOpenChange={handleOpenChange}
>
<Calendar
mode="single"
className="h-full w-full border rounded-lg"
selected={selectedDate}
onSelect={handleDaySelect}
onMonthChange={() => {
// month 바뀐 직후 DOM 변화가 생기므로 다음 프레임에서 계산
requestAnimationFrame(() => {
updateWeekCount();
});
}}
classNames={{
months: cn(
defaultClassNames.months,
"w-full h-full relative"
),
nav: cn(
defaultClassNames.nav,
"flex w-full item-center gap-1 justify-around absolute top-0 inset-x-0"
),
month: cn(
defaultClassNames.month,
"h-full w-full flex flex-col"
),
month_grid: cn(
defaultClassNames.month_grid,
"w-full h-full flex-1"
),
weeks: cn(
defaultClassNames.weeks,
"w-full h-full"
),
weekdays: cn(
defaultClassNames.weekdays,
"w-full"
),
week: cn(
defaultClassNames.week,
`w-full`
),
day: cn(
defaultClassNames.day,
`w-[calc(100%/7)] rounded-none`
),
day_button: cn(
defaultClassNames.day_button,
"h-full w-full flex p-2 justify-start items-start",
"hover:bg-transparent",
"data-[selected-single=true]:bg-transparent data-[selected-single=true]:text-black"
),
selected: cn(
defaultClassNames.selected,
"h-full border-0 fill-transparent"
),
today: cn(
defaultClassNames.today,
"h-full"
),
}}
styles={{
day: {
height: `calc(100%/${weekCount})`
},
}}
components={{
Day: ({ day, ...props }) => {
const date = day.date;
const isSelected = selectedDate && isSameDay(selectedDate, date);
return (
<td {...props}>
{ isSelected
? <PopoverTrigger asChild>
{props.children}
</PopoverTrigger>
: props.children
}
</td>
)
},
DayButton: ({ day, ...props}) => (
<button
{...props}
disabled={day.outside}
>
{props.children}
</button>
)
}}
/>
<SchedulePopover
date={selectedDate}
popoverSide={popoverSide}
popoverAlign={popoverAlign}
/>
</Popover>
</div>
)
}

View File

@@ -0,0 +1,72 @@
import { PopoverContent } from "@/components/ui/popover"
import type { ColorPaletteType } from "@/const/ColorPalette"
import { usePalette } from "@/hooks/use-palette";
import { useState } from "react";
interface ColorPickPopoverProps {
setColor: (color: ColorPaletteType) => void;
}
export const ColorPickPopover = ({ setColor }: ColorPickPopoverProps) => {
const [seeMore, setSeeMore] = useState(false);
const {
getMainPaletteList,
getExtraPaletteList,
getCustomColor
} = usePalette();
const mainPaletteList = getMainPaletteList();
const extraPaletteList = getExtraPaletteList();
const getSlicedList = (paletteList: ColorPaletteType[], length: number) => {
const slicedList: ColorPaletteType[][] = [];
let index = 0;
while (index < paletteList.length) {
slicedList.push(paletteList.slice(index, index + length));
index += length;
}
return slicedList;
}
return (
<PopoverContent
className="flex flex-col gap-1.5 w-fit"
>
{getSlicedList(mainPaletteList, 5).map((list) => (
<div className="flex flex-row gap-2.5">
{list.map((palette) => (
<div
className="rounded-full w-5 h-5 border border-gray-300"
style={{ backgroundColor: `${palette.style}` }}
onClick={() => setColor(palette)}
/>
))}
</div>
))}
{
!seeMore
? <div className="w-full" onClick={() => setSeeMore(true)}> </div>
: <>
{getSlicedList(extraPaletteList, 5).map((list) => (
<div className="flex flex-row gap-2.5">
{list.map((palette) => (
<div
className="rounded-full w-5 h-5 border border-gray-300"
style={{
backgroundColor: `${palette.style !== 'transparent' && palette.style}`,
background: `${palette.style === 'transparent' && 'linear-gradient(135deg, black 50%, white 50%)' }`
}}
onClick={() => setColor(palette)}
/>
))}
</div>
))}
</>
}
{
seeMore
? <div className="w-full" onClick={() => setSeeMore(false)}></div>
: null
}
</PopoverContent>
)
}

View File

@@ -0,0 +1,75 @@
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover';
import { ScrollArea } from '@/components/ui/scroll-area';
import { Sheet, SheetContent, SheetHeader } from '@/components/ui/sheet';
import { cn } from '@/lib/utils';
import { useEffect, useState } from 'react';
import { usePalette } from '@/hooks/use-palette';
import { type ColorPaletteType } from '@/const/ColorPalette';
import { ColorPickPopover } from './ColorPickPopover';
import { Input } from '@/components/ui/input';
interface ScheduleSheetProps {
date: Date | undefined;
popoverSide: 'left' | 'right';
popoverAlign: 'start' | 'end';
}
export const SchedulePopover = ({ date, popoverSide, popoverAlign }: ScheduleSheetProps) => {
const {
ColorPaletteType,
getPaletteNameList,
getMainPaletteList,
getAllPaletteList,
getCustomColor,
getPaletteByKey,
getStyle
} = usePalette();
const defaultColor = getPaletteByKey('Black');
const [scheduleColor, setScheduleColor] = useState(defaultColor);
const [colorPopoverOpen, setColorPopoverOpen] = useState(false);
const selectColor = (color: ColorPaletteType) => {
setScheduleColor(color);
setColorPopoverOpen(false);
}
return (
<PopoverContent
className="rounded-xl xl:w-[calc(100vw/4)] xl:max-w-[480px] min-w-[320px]"
align={popoverAlign} side={popoverSide}
>
<ScrollArea
className={
cn(
"[&>div>div:last-child]:hidden min-h-[125px] h-[calc(100vh/2)] p-2.5 w-full flex flex-col",
)
}
>
<div className="w-full flex flex-row justify-center items-center gap-4">
<Popover open={colorPopoverOpen} onOpenChange={setColorPopoverOpen}>
<PopoverTrigger asChild>
<div
className={cn(
'rounded-full w-5 h-5 border-2 border-gray-300',
)}
style={{
backgroundColor: `${scheduleColor.style !== 'transparent' && scheduleColor.style}`,
background: `${scheduleColor.style === 'transparent' && 'linear-gradient(135deg, black 50%, white 50%)' }`
}}
/>
</PopoverTrigger>
<ColorPickPopover
setColor={selectColor}
/>
</Popover>
<Input
placeholder="제목"
className="font-bold border-t-0 border-r-0 border-l-0 p-0 border-b-2 rounded-none shadow-none border-indigo-300 focus-visible:ring-0 focus-visible:border-b-indigo-500"
style={{
fontSize: '20px'
}}
/>
</div>
</ScrollArea>
</PopoverContent>
)
}

View File

@@ -4,7 +4,7 @@ import { Field, FieldError, FieldLabel } from '@/components/ui/field';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useCallback, useState } from 'react'; import React, { useCallback, useEffect, useState } from 'react';
import { Controller, useForm } from 'react-hook-form'; import { Controller, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { PageRouting } from '@/const/PageRouting'; import { PageRouting } from '@/const/PageRouting';
@@ -15,10 +15,15 @@ import { LoginRequest } from '@/data/request/account/LoginRequest';
import { AccountNetwork } from '@/network/AccountNetwork'; import { AccountNetwork } from '@/network/AccountNetwork';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { useAuthStore } from '@/store/authStore'; import { useAuthStore } from '@/store/authStore';
import { Checkbox } from '@/components/ui/checkbox';
import { Label } from '@/components/ui/label';
import { useIsMobile } from '@/hooks/use-mobile';
export default function LoginPage() { export default function LoginPage() {
const [isLoading, setIsLoading] = useState<boolean>(false); const [isLoading, setIsLoading] = useState<boolean>(false);
const [autoLogin, setAutoLogin] = useState<boolean>(localStorage.getItem('autoLogin') === 'true');
const { login } = useAuthStore(); const { login } = useAuthStore();
const isMobile = useIsMobile();
const navigate = useNavigate(); const navigate = useNavigate();
const accountNetwork = new AccountNetwork(); const accountNetwork = new AccountNetwork();
const loginForm = useForm<z.infer<typeof LoginSchema>>({ const loginForm = useForm<z.infer<typeof LoginSchema>>({
@@ -30,6 +35,10 @@ export default function LoginPage() {
}); });
const { id, password } = { id: loginForm.watch('id'), password: loginForm.watch('password') }; const { id, password } = { id: loginForm.watch('id'), password: loginForm.watch('password') };
useEffect(() => {
localStorage.setItem('autoLogin', `${autoLogin}`);
}, [autoLogin]);
const moveToSignUpPage = useCallback(() => { const moveToSignUpPage = useCallback(() => {
navigate(PageRouting["SIGN_UP"].path); navigate(PageRouting["SIGN_UP"].path);
}, []); }, []);
@@ -53,39 +62,33 @@ export default function LoginPage() {
const loginPromise = accountNetwork.login(data); const loginPromise = accountNetwork.login(data);
toast.promise<{ message?: string }>( toast.promise(
() => new Promise(async (resolve, reject) => { loginPromise,
try {
loginPromise.then((res) => {
if (res.data.success) {
resolve({message: ''});
} else {
reject(res.data.message);
}
})
} catch (err) {
reject ("서버 에러 발생");
}
}),
{ {
loading: "로그인 중입니다.", loading: "로그인 중입니다.",
success: "로그인이 완료되었습니다.", success: (res) => {
error: (err) => `${err}` setIsLoading(false);
}
);
loginPromise
.then((res) => {
if (res.data.success) { if (res.data.success) {
const data = { const data = {
accessToken: res.data.accessToken!, accessToken: res.data.accessToken!,
refreshToken: res.data.refreshToken! refreshToken: res.data.refreshToken!
};
login({...data});
if (autoLogin) {
localStorage.setItem('auth-storage', JSON.stringify({ state: data }));
} }
login({ ...data });
moveToHomePage(); moveToHomePage();
return "로그인 성공";
} else {
throw new Error(res.data.message);
} }
}) },
.finally(() => setIsLoading(false)); error: (err: Error) => {
setIsLoading(false);
return err.message || "에러 발생"
}
}
);
} }
const TextSeparator = ({ text }: { text: string }) => { const TextSeparator = ({ text }: { text: string }) => {
@@ -98,9 +101,16 @@ export default function LoginPage() {
) )
} }
const handleEnterKeyDown = async (e: React.KeyboardEvent<HTMLInputElement>) => {
if (!(e.key === 'Enter')) return;
const result = await loginForm.trigger();
if (!result) return;
await reqLogin();
}
return ( return (
<div className="w-full h-full flex flex-col justify-center items-center"> <div className="w-full h-full flex flex-col justify-center items-center">
<Card className="w-md pl-2 pr-2"> <Card className={isMobile ? "w-full pl-2 pr-2" : "w-md pl-2 pr-2"}>
<CardHeader> <CardHeader>
</CardHeader> </CardHeader>
@@ -117,6 +127,8 @@ export default function LoginPage() {
type="text" type="text"
id="form-login-id" id="form-login-id"
aria-invalid={fieldState.invalid} aria-invalid={fieldState.invalid}
tabIndex={1}
onKeyDown={handleEnterKeyDown}
/> />
<FieldError errors={[fieldState.error]} /> <FieldError errors={[fieldState.error]} />
</Field> </Field>
@@ -134,6 +146,7 @@ export default function LoginPage() {
className="p-0 bg-transparent hover:bg-transparent h-fit w-fit text-xs text-gray-400 hover:text-gray-500 cursor-pointer" className="p-0 bg-transparent hover:bg-transparent h-fit w-fit text-xs text-gray-400 hover:text-gray-500 cursor-pointer"
onClick={moveToResetPasswordPage} onClick={moveToResetPasswordPage}
type="button" type="button"
tabIndex={3}
> >
? ?
</Button> </Button>
@@ -143,13 +156,28 @@ export default function LoginPage() {
type="password" type="password"
id="form-login-password" id="form-login-password"
aria-invalid={fieldState.invalid} aria-invalid={fieldState.invalid}
tabIndex={2}
onKeyDown={handleEnterKeyDown}
/> />
<FieldError errors={[fieldState.error]} /> <FieldError errors={[fieldState.error]} />
</Field> </Field>
)} )}
> >
</Controller> </Controller>
<div className="flex flex-row gap-2 mt-2">
<Checkbox
className={[
"data-[state=checked]:bg-indigo-500 data-[state=checked]:text-white"
, "data-[state=checked]:outline-none data-[state=checked]:border-0"
].join(' ')}
id="auto-login"
checked={autoLogin}
onCheckedChange={(value) => setAutoLogin(value === true)}
/>
<Label htmlFor="auto-login"> </Label>
</div>
</form> </form>
</CardContent> </CardContent>
<CardFooter <CardFooter
className="w-full flex flex-col items-center gap-5" className="w-full flex flex-col items-center gap-5"

View File

@@ -4,7 +4,7 @@ import { Field, FieldError, FieldLabel } from '@/components/ui/field';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input'; import { Input } from '@/components/ui/input';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useState, useCallback } from 'react'; import React, { useState, useCallback } from 'react';
import { Controller, useForm } from 'react-hook-form'; import { Controller, useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { PageRouting } from '@/const/PageRouting'; import { PageRouting } from '@/const/PageRouting';
@@ -19,7 +19,7 @@ import { Label } from '@/components/ui/label';
const steps = [1, 2, 3, 4]; const steps = [1, 2, 3, 4];
export default function ResetPasswordPage() { export default function ResetPasswordPage() {
const [currentStep, setCurrentStep] = useState(4); const [currentStep, setCurrentStep] = useState(1);
const [showPassword, setShowPassword] = useState(false); const [showPassword, setShowPassword] = useState(false);
const [showPasswordConfirm, setShowPasswordConfirm] = useState(false); const [showPasswordConfirm, setShowPasswordConfirm] = useState(false);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
@@ -87,11 +87,8 @@ export default function ResetPasswordPage() {
const handleSecondStepOTPCompleted = async () => { const handleSecondStepOTPCompleted = async () => {
if (isLoading) return; if (isLoading) return;
if (!Validator.validatePasswordFormat(code)) { const codeValid = await resetPasswordForm.trigger('code');
resetPasswordForm.setError('code', { if (!codeValid) {
type: 'pattern',
message: '올바른 코드 형식이 아닙니다.'
});
return; return;
} }
@@ -105,7 +102,7 @@ export default function ResetPasswordPage() {
try { try {
const response = await accountNetwork.verifyResetPasswordCode(data); const response = await accountNetwork.verifyResetPasswordCode(data);
const resData = response.data; const resData = response.data;
console.log(resData);
if (!resData.success || !resData.verified) { if (!resData.success || !resData.verified) {
resetPasswordForm.setError('code', { resetPasswordForm.setError('code', {
type: 'value', type: 'value',
@@ -125,7 +122,7 @@ export default function ResetPasswordPage() {
} }
} }
const handleThirdStepButton = async () => { const handleClickThirdStepButton = async () => {
if (isLoading) return; if (isLoading) return;
const passwordValid = await resetPasswordForm.trigger('password'); const passwordValid = await resetPasswordForm.trigger('password');
if (!passwordValid) return; if (!passwordValid) return;
@@ -162,6 +159,19 @@ export default function ResetPasswordPage() {
} }
const handleEnterKeyDown = async (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
e.preventDefault();
if (currentStep === 1) {
await handleClickFirstStepButton();
return;
}
if (currentStep === 3) {
await handleClickThirdStepButton();
}
}
}
return ( return (
<Stepper <Stepper
value={currentStep} value={currentStep}
@@ -214,13 +224,7 @@ export default function ResetPasswordPage() {
type="email" type="email"
id="reset-password-email" id="reset-password-email"
aria-invalid={fieldState.invalid} aria-invalid={fieldState.invalid}
onKeyDown={(e) => { onKeyDown={handleEnterKeyDown}
if (e.key === 'Enter') {
e.preventDefault();
if (email.length === 0) return;
handleClickFirstStepButton();
}
}}
/> />
<FieldError className="font-[12px]" errors={[fieldState.error]} /> <FieldError className="font-[12px]" errors={[fieldState.error]} />
</> </>
@@ -278,6 +282,7 @@ export default function ResetPasswordPage() {
type={ showPassword ? "text" : "password" } type={ showPassword ? "text" : "password" }
id="reset-password-password" id="reset-password-password"
aria-invalid={fieldState.invalid} aria-invalid={fieldState.invalid}
onKeyDown={handleEnterKeyDown}
className="pr-10" className="pr-10"
/> />
<button <button
@@ -309,6 +314,7 @@ export default function ResetPasswordPage() {
id="reset-password-password-confirm" id="reset-password-password-confirm"
className="pr-10" className="pr-10"
aria-invalid={fieldState.invalid} aria-invalid={fieldState.invalid}
onKeyDown={handleEnterKeyDown}
/> />
<button <button
type="button" type="button"
@@ -383,7 +389,7 @@ export default function ResetPasswordPage() {
(password.trim().length < 1) (password.trim().length < 1)
&& (passwordConfirm.trim().length < 1) && (passwordConfirm.trim().length < 1)
} }
onClick={handleThirdStepButton} onClick={handleClickThirdStepButton}
> >
</Button> </Button>

View File

@@ -18,6 +18,8 @@ import { AccountNetwork } from '@/network/AccountNetwork';
import { toast } from 'sonner'; import { toast } from 'sonner';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { PageRouting } from '@/const/PageRouting'; import { PageRouting } from '@/const/PageRouting';
import { useIsMobile } from '@/hooks/use-mobile';
import { ScrollArea } from '@/components/ui/scroll-area';
export default function SignUpPage() { export default function SignUpPage() {
const [emailVerificationModalOpen, setEmailVerificationModalOpen] = useState<boolean>(false); const [emailVerificationModalOpen, setEmailVerificationModalOpen] = useState<boolean>(false);
@@ -28,6 +30,7 @@ export default function SignUpPage() {
const accountNetwork = new AccountNetwork(); const accountNetwork = new AccountNetwork();
const navigate = useNavigate(); const navigate = useNavigate();
const isMobile = useIsMobile();
const signUpForm = useForm<z.infer<typeof SignUpSchema>>({ const signUpForm = useForm<z.infer<typeof SignUpSchema>>({
resolver: zodResolver(SignUpSchema), resolver: zodResolver(SignUpSchema),
@@ -119,9 +122,11 @@ export default function SignUpPage() {
} }
return ( return (
<div className="w-full h-full flex flex-col justify-center items-center"> <div className={"w-full h-full flex flex-col justify-center items-center"}>
<Card className="w-md pl-2 pr-2">
<Card className={isMobile ? "w-full pl-2 pr-2" : "w-md pl-2 pr-2"}>
<CardHeader></CardHeader> <CardHeader></CardHeader>
<ScrollArea className="h-72 [&>div>div:last-child]:hidden">
<CardContent> <CardContent>
<form id="form-signup"> <form id="form-signup">
<FieldGroup> <FieldGroup>
@@ -244,6 +249,7 @@ export default function SignUpPage() {
</FieldGroup> </FieldGroup>
</form> </form>
</CardContent> </CardContent>
</ScrollArea>
<CardFooter> <CardFooter>
<EmailVerificationModal <EmailVerificationModal
trigger={ trigger={
@@ -257,7 +263,9 @@ export default function SignUpPage() {
onVerifySuccess={signup} // ✅ 인증 성공 시 signup 호출 onVerifySuccess={signup} // ✅ 인증 성공 시 signup 호출
/> />
</CardFooter> </CardFooter>
</Card> </Card>
</div> </div>
); );
} }

View File

@@ -0,0 +1,7 @@
export const HomePage = () => {
return (
<div className="w-full h-full flex flex-column">
HomePage
</div>
)
};

View File

@@ -0,0 +1,11 @@
import { CustomCalendar } from "@/ui/component/calendar/CustomCalendar";
export function ScheduleMainPage() {
return (
<div
className="w-full h-full p-2"
>
<CustomCalendar />
</div>
)
}

View File

@@ -7,6 +7,7 @@ export class Validator {
static validatePasswordFormat = (password: string): boolean => { static validatePasswordFormat = (password: string): boolean => {
if (password.length < 8) return false; if (password.length < 8) return false;
if (password.includes(' ')) return false;
const alphabets = 'abcdefghijklmnopqrstuvwxyz'; const alphabets = 'abcdefghijklmnopqrstuvwxyz';
const numbers = '0123456789'; const numbers = '0123456789';

View File

@@ -5,6 +5,7 @@ import path from 'path'
// https://vite.dev/config/ // https://vite.dev/config/
export default defineConfig({ export default defineConfig({
server: { server: {
host: '0.0.0.0',
port: 5185 port: 5185
}, },
plugins: [ plugins: [