Commit Graph

425 Commits

Author SHA1 Message Date
yoon
a169d71c1d useUserStore -> useUserInfoStore 2025-02-14 13:24:26 +09:00
a1efaf1d90 . 2025-02-14 12:55:18 +09:00
a8d33a2555 . 2025-02-14 12:50:37 +09:00
cf4e56472a 프로필 부분 정리 2025-02-14 12:47:39 +09:00
8e438ff900 t용어집수정정 2025-02-14 12:16:24 +09:00
e14af4de3d Merge branch 'wordDict' 2025-02-14 11:07:39 +09:00
Dang
d71db81856 용어집 카테고리 등록 2025-02-14 11:02:45 +09:00
af36b11b6e . 2025-02-14 03:02:38 +09:00
737481cbae 대댓글완료 2025-02-14 03:01:30 +09:00
f7ca508a9c 휴가가리스트 모달 2025-02-13 16:25:20 +09:00
yoon
1e1834213b Merge branch 'main' into project-list 2025-02-13 14:58:51 +09:00
yoon
264bb09dd5 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-13 14:50:54 +09:00
yoon
6edb911d43 프로젝트 목록 2025-02-13 14:48:51 +09:00
yoon
380fd9cb1d 모달 수정 2025-02-13 14:48:44 +09:00
yoon
9007e60f26 공통 불러오는 코드 수정 2025-02-13 14:48:25 +09:00
yoon
40dd760700 코드 수정 2025-02-13 14:48:12 +09:00
yoon
1e305ea86d class 수정 2025-02-13 14:48:05 +09:00
yoon
3378dcf93c is-row 추가 2025-02-13 14:47:46 +09:00
yoon
18d4095f1b class 수정 2025-02-13 14:47:24 +09:00
yoon
c8ca8f936f 주석 변경 2025-02-13 14:46:38 +09:00
yoon
558008acc5 commonApi 로직 수정 2025-02-13 14:38:07 +09:00
04ab0325b7 Merge remote-tracking branch 'origin/main' into board-comment 2025-02-13 13:27:51 +09:00
7426dd8926 좋아요/싫어요버튼 머지 2025-02-13 13:25:22 +09:00
e4c8b0aa1f 휴가관리 사원프로필 2025-02-13 13:20:44 +09:00
7774bfe80a 대댓글 진행중 2025-02-13 13:20:11 +09:00
e81229db4c 댓글 조회 및 등록 2025-02-13 12:03:43 +09:00
cfa46c0a6d 개발용도의 쿠키 세팅 2025-02-13 11:54:38 +09:00
34a1c8360d . 2025-02-12 23:48:33 +09:00
12538f0046 댓글등록 진행중 2025-02-12 23:43:38 +09:00
f33cada52f 익명일때 코멘트 익명 인풋 완료 2025-02-12 17:39:35 +09:00
e4455e94e5 휴가 사원리스트추가 2025-02-11 16:18:05 +09:00
024807ccda board-view-content 머지 2025-02-11 15:10:02 +09:00
4daab961cf 휴가저장장 2025-02-11 15:03:25 +09:00
yoon
8ab9e79b5a userlist 코드 수정 2025-02-11 12:59:49 +09:00
yoon
724f0afc61 headers 경로 추가 -> 응답 다르게 하기 2025-02-11 10:33:40 +09:00
yoon
c3b2bcec66 응답 인터셉터 수정 2025-02-11 10:33:09 +09:00
baed45ebc9 css정리 2025-02-11 10:21:59 +09:00
5a64d77502 머지 2025-02-10 16:24:11 +09:00
yoon
3cb3281a86 카테고리 목록 불러오기 수정 2025-02-10 16:10:28 +09:00
yoon
8fcc702d9b Merge branch 'main' into project-list 2025-02-10 16:08:45 +09:00
yoon
d96de3745e Merge branch 'main' into wordDict 2025-02-10 16:07:51 +09:00
yoon
34acf8aedb 프로젝트 목록 2025-02-10 16:07:24 +09:00
yoon
608f7be852 label, value 형식으로 수정 2025-02-10 16:07:09 +09:00
yoon
d47e3f0d6d yearCategory, cateList 추가 2025-02-10 16:06:22 +09:00
Dang
8fd19938ba 용어집 등록 2025-02-10 16:04:33 +09:00
296dd2452a 보드프로필 2025-02-10 15:57:23 +09:00
yoon
62047cbf80 Merge branch 'main' into project-list 2025-02-10 15:13:16 +09:00
yoon
4ebab7cf95 disabled 추가 2025-02-10 15:11:07 +09:00
yoon
23cd85d727 프로젝트 목록 2025-02-10 14:59:56 +09:00
yoon
2e270291f5 Merge branch 'main' into project-list 2025-02-10 14:47:04 +09:00
yoon
9d1911be9a Merge branch 'main' into login 2025-02-10 14:45:39 +09:00
yoon
8a15c9c1cc 프로젝트 목록 추가 2025-02-10 14:45:13 +09:00
yoon
4413001d9d 로그인 로직 변경 2025-02-10 14:44:29 +09:00
yoon
6704f5531a 응답 인터셉터 추가 2025-02-10 14:41:37 +09:00
c8dbd53e3a 보드프로필 머지 2025-02-10 14:02:27 +09:00
fee7b52384 board-view-content 머지 2025-02-10 14:00:30 +09:00
yoon
8427dce4cc Merge branch 'main' into login 2025-02-10 10:28:24 +09:00
yoon
de1a6e19c5 비밀번호 재설정 2025-02-10 10:27:53 +09:00
f707329f79 console제거거 2025-02-07 14:59:58 +09:00
cb67307a62 user수정정 2025-02-07 14:58:14 +09:00
yoon
58fdb1f673 기존 비밀번호 체크 2025-02-07 14:53:17 +09:00
7d03da5097 Merge branch 'khj' 2025-02-07 14:48:04 +09:00
a0683ec69f Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-07 14:45:50 +09:00
f40e3ed7d1 수정 2025-02-07 14:45:17 +09:00
05dca89be0 휴가저장,리스트 2025-02-07 14:40:25 +09:00
yoon
3f7cf45f4c log 삭제 2025-02-07 13:46:05 +09:00
yoon
74b29bede3 Merge branch 'main' into login 2025-02-07 13:37:25 +09:00
854c0c91e9 userList수정 2025-02-07 10:30:18 +09:00
yoon
646c775d6a Merge branch 'main' into wordDict 2025-02-07 09:39:57 +09:00
yoon
b3bfe27736 간격 설정 2025-02-07 09:37:19 +09:00
Dang
e61bcd20ce 용어집 등록 2025-02-06 16:16:25 +09:00
yoon
32d68f198b user 정보 2025-02-06 14:20:51 +09:00
yoon
81d68ea2f1 로그인 한 user 프로필 가져옴 2025-02-06 14:20:30 +09:00
yoon
30a111c8e0 로그인 시 user정보 2025-02-06 14:20:13 +09:00
69afdab946 용어집 카테고리 수정 2025-02-06 13:26:07 +09:00
yoon
5d1f220f14 비밀번호 재설정 2025-02-06 10:49:08 +09:00
67d5bede32 용여집 수정정 2025-02-06 10:29:08 +09:00
yoon
f3ca41f9ad Merge branch 'main' into login 2025-02-06 09:26:50 +09:00
yoon
c95a2ae80b Merge branch 'main' into wordDict 2025-02-06 09:25:59 +09:00
yoon
4329d9febd Merge branch 'main' into board-view-content 2025-02-06 09:25:12 +09:00
yoon
7304b9f03b 비밀번호 재설정 추가 2025-02-06 09:24:13 +09:00
yoon
0a91dbef09 비밀번호 힌트 공통에서 받아오는 걸로 변경 2025-02-06 09:24:01 +09:00
yoon
ffd23da7f4 title 두껍게 2025-02-06 09:23:31 +09:00
yoon
9d96f2141d 오늘 날짜 이후로 선택 X 2025-02-06 09:23:11 +09:00
yoon
b841029bbe 공통 api 2025-02-06 09:22:50 +09:00
67bb83277a 게시판 리스트 번호 수정 2025-02-04 16:21:07 +09:00
68c096b43f 게시판리스트 수정정 2025-02-04 16:15:47 +09:00
815019e02a Merge remote-tracking branch 'origin/main' into board-view-content 2025-02-04 16:06:43 +09:00
552f307c45 좋아요 작업중 2025-02-04 16:05:48 +09:00
Dang
69b5216963 용어집 입력 및 입력 수정 중 2025-02-04 15:59:28 +09:00
0209dcbdc0 Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-04 15:56:10 +09:00
1de0c882dd 보드리스트 수정 및 보드카드 원복 2025-02-04 15:56:08 +09:00
yoon
9ee69e6730 api 2025-02-04 14:22:49 +09:00
57c81b36a5 날짜 수정 완료 2025-02-04 13:38:26 +09:00
yoon
e038c84baf Merge branch 'main' into login 2025-02-04 13:06:30 +09:00
233a345ae2 용어집 수정ㅇㅇㅇ 2025-02-04 11:12:09 +09:00
yoon
97cebc26d8 logout, 아이콘 변경 2025-02-04 11:11:24 +09:00
yoon
21f48d0e27 로그인 했을 시 로그인,회원가입 페이지 이동X 2025-02-04 11:10:31 +09:00
d3170637c0 Merge branch 'main' into khj 2025-02-04 11:01:47 +09:00
822223ff0d Merge branch 'main' of http://192.168.0.251:3000/localnet/localhost-front 2025-02-04 11:01:10 +09:00
64b0de3e7f 용어집 수정 2025-02-04 10:59:49 +09:00
d1aa5fb438 날짜 변환전, 좋아요 해결완료 2025-02-04 10:57:18 +09:00
8cfffa6610 글쓰기 카테고리 공통코드 수정정 2025-02-03 16:18:31 +09:00
927b742fab Merge branch 'wordDict' 2025-02-03 16:06:46 +09:00
Dang
e6efc307ca 용어집 목록 수정 2025-02-03 15:57:03 +09:00
yoon
66061435e1 Merge branch 'main' into login 2025-02-03 15:12:24 +09:00
yoon
4ffb98b7cf 줄 맞춤 2025-02-03 15:11:25 +09:00
yoon
4258c57512 remember 체크 2025-02-03 15:07:50 +09:00
yoon
a4cb9936ab watchEffect -> watch 2025-02-03 15:07:29 +09:00
8e42b6b2b5 카드 넓이고정 2025-02-03 14:57:34 +09:00
9937e8591e 게시판머지2 2025-02-03 14:51:51 +09:00
f853c4e25d board-view-profile1 머지 2025-02-03 14:31:48 +09:00
dbc0ad83ae 보드리스트 width 수정 2025-02-03 10:48:21 +09:00
8ceddc8036 Merge remote-tracking branch 'origin/main' into board-firstimg 2025-01-24 15:40:03 +09:00
e4df111725 썸네일 이미지 2025-01-24 15:39:30 +09:00
b4df01f01c 파일수정 머지 2025-01-24 15:35:11 +09:00
yoon
758a717d47 Merge branch 'main' into board-view-profile 2025-01-24 15:18:25 +09:00
88c9071828 라인 삭제 2025-01-24 15:15:49 +09:00
e177ddec1a Merge remote-tracking branch 'origin/main' into board-view-profile 2025-01-24 15:14:15 +09:00
a95e971f49 Merge remote-tracking branch 'origin/main' into board-content 2025-01-24 15:13:47 +09:00
yoon
11d936bcc5 Merge branch 'main' into wordDict 2025-01-24 15:12:09 +09:00
yoon
dfbfbabc2e Merge branch 'main' into khj 2025-01-24 15:06:45 +09:00
Dang
f32a45c69c 용어집 작업 2025-01-24 15:03:55 +09:00
e5ccaa1a12 투표 컴포넌트 추가가 2025-01-24 15:02:19 +09:00
480ba2bd8a 사용자 목록 공통통 2025-01-24 15:02:07 +09:00
fb12e345a7 게시판 저장 수정정,파일제한 추가 2025-01-24 14:44:18 +09:00
dd9a94e3a9 말줄임 및 컨텐츠 수정 2025-01-24 14:09:09 +09:00
2f0f5fd378 첨부파일저장 수정 2025-01-24 13:53:38 +09:00
7b138452c2 Merge remote-tracking branch 'origin/main' into board-view-profile 2025-01-24 12:27:39 +09:00
8b38019b95 프로필, 댓글 디자인 정리 2025-01-24 12:26:46 +09:00
yoon
4d8c0ff9f8 Merge branch 'main' into login 2025-01-24 10:02:23 +09:00
yoon
55ca1308fe 주소 로직 변경, 생년월일 추가 2025-01-24 10:01:43 +09:00
yoon
0ee5425663 주소 + 주소상세 삭제 2025-01-24 09:50:58 +09:00
93d7acd745 Merge remote-tracking branch 'origin/main' into board-view-profile 2025-01-23 14:04:38 +09:00
02a542c12e 수정중 2025-01-23 14:03:16 +09:00
yoon
0c22f105f6 투표게시판 경로 지움 2025-01-23 12:45:48 +09:00
yoon
5cab531cdd Merge branch 'main' into khj 2025-01-23 12:43:26 +09:00
yoon
7ec3255c9d 비밀번호 재설정 생성 2025-01-23 12:40:09 +09:00
c97996f85d 게시판 수정 2025-01-23 12:39:21 +09:00
6f91347b32 Merge remote-tracking branch 'origin/main' into board-view-profile 2025-01-23 11:18:08 +09:00
498ce1f0cd 코멘트, 조회수 수정중 2025-01-23 11:15:55 +09:00
yoon
3699b8386f Merge branch 'main' into board-notice-select 2025-01-23 11:14:06 +09:00
yoon
5095f68d6b register -> user 로 axios 경로 변경 2025-01-23 09:50:28 +09:00
yoon
aeecd3836d Merge branch 'main' into login 2025-01-21 20:48:49 +09:00
3681ed9031 Merge branch 'main' into khj 2025-01-21 15:52:40 +09:00
yoon
8089e98103 주석 품 2025-01-21 15:49:17 +09:00
2a910488b8 투표 경로 추가 2025-01-21 15:48:31 +09:00
affaf916be board-notice-select 머지 2025-01-21 15:45:06 +09:00
yoon
e9d1e92e62 Merge branch 'main' into login 2025-01-21 15:44:26 +09:00
yoon
fe73ea2c56 ToastModal 위치 변경 2025-01-21 15:44:05 +09:00