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

๐Ÿ”€ :: 1.0 ๋ฆด๋ฆฌ์ฆˆ #30

Merged
merged 70 commits into from
Nov 28, 2023
Merged
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
4ceee62
feat :: ๊ธฐ์—…, ๋ชจ์ง‘์˜๋ขฐ์„œ ๋ฆฌ์ŠคํŠธ ์Šค์ผˆ๋ ˆํ†ค UI ์ถ”๊ฐ€
KANGYONGSU23 Nov 13, 2023
43551a9
feat :: ๋ถ๋งˆํฌ api ์ž‘์„ฑ
KANGYONGSU23 Nov 15, 2023
e15f983
feat :: ๋ถ๋งˆํฌ
KANGYONGSU23 Nov 16, 2023
1987c34
file :: ํŒŒ์ผ ์œ„์น˜ ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 17, 2023
a5836f5
fix :: ๋„ค์ด๋ฐ ์ฒด์ธ์ง€
KANGYONGSU23 Nov 17, 2023
3493f0b
fix :: Array.from ์ ์šฉ
KANGYONGSU23 Nov 17, 2023
267d06d
fix :: ๊ตฌ์กฐ๋ถ„ํ•ด ํ• ๋‹น
KANGYONGSU23 Nov 17, 2023
188ff36
file :: ๋„ค์ด๋ฐ ์ฒด์ธ์ง€
KANGYONGSU23 Nov 17, 2023
33f2f00
๐Ÿ”€ :: ๊ธฐ์—…, ๋ชจ์ง‘์˜๋ขฐ์„œ ๋ฆฌ์ŠคํŠธ ์Šค์ผˆ๋ ˆํ†ค UI ์ถ”๊ฐ€
KANGYONGSU23 Nov 17, 2023
908ffd0
Merge branch 'develop' into feature/Bookmark
Nov 17, 2023
9bf8227
fix :: conflicts ํ•ด๊ฒฐ
Nov 17, 2023
648eadc
fix :: queryClient ์ˆ˜์ •
KANGYONGSU23 Nov 17, 2023
98761f2
๐Ÿ”€ :: ๋ชจ์ง‘์˜๋ขฐ์„œ ๋ถ๋งˆํฌ
KANGYONGSU23 Nov 17, 2023
79253df
feat :: ์ง€์›ํ•˜๊ธฐ ํผ๋ธ”๋ฆฌ์‹ฑ
KANGYONGSU23 Nov 22, 2023
6ec73e0
Merge branch 'hotfix' into develop
Nov 22, 2023
b0f8f46
feat :: api ์—ฐ๋™
KANGYONGSU23 Nov 23, 2023
79ee73a
feat :: Loading ์• ๋‹ˆ๋ฉ”์ด์…˜
KANGYONGSU23 Nov 23, 2023
1c8a970
update :: ๋””์ž์ธ์‹œ์Šคํ…œ ๋ฒ„์ „ ์—…
KANGYONGSU23 Nov 23, 2023
627b411
fix :: useModal ์ˆ˜์ •
KANGYONGSU23 Nov 23, 2023
1cb8124
feat :: ๊ธฐ์—…์ง€์› API ์—ฐ๋™
KANGYONGSU23 Nov 23, 2023
85a52b2
feat :: openModal์‹œ ์Šคํฌ๋กค ๋ฐฉ์ง€
KANGYONGSU23 Nov 23, 2023
d30423c
faet :: ํผ๋ธ”๋ฆฌ์‹ฑ
KANGYONGSU23 Nov 24, 2023
113f9e2
delete :: console ์ •๋ฆฌ
KANGYONGSU23 Nov 24, 2023
c906d5f
fix :: ๋ธŒ๋žœ์น˜ ์ด๋ฆ„ ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 24, 2023
5fee56c
ci ์˜ค๋ฅ˜ ์ˆ˜์ •
KANGYONGSU23 Nov 24, 2023
30fc764
ci ์˜ค๋ฅ˜ ์ˆ˜์ •
KANGYONGSU23 Nov 24, 2023
0ef4f02
fix :: ci ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
KANGYONGSU23 Nov 24, 2023
fc8f744
Merge branch 'develop' into feature/Apply
Nov 24, 2023
4e2ad61
fix :: tailwind css ์ ์šฉ
KANGYONGSU23 Nov 24, 2023
2853210
feat :: kebab๋ฉ”๋‰ด ๋“œ๋กญ๋‹ค์šด
KANGYONGSU23 Nov 24, 2023
4722c3b
feat :: profile ์ •๋ณด
KANGYONGSU23 Nov 24, 2023
a08147c
delete :: ์ฝ”๋“œ์ •๋ฆฌ
KANGYONGSU23 Nov 24, 2023
b6fc12b
feat :: api์—ฐ๋™
KANGYONGSU23 Nov 25, 2023
1ce5a2d
feat :: fileDownload
KANGYONGSU23 Nov 25, 2023
04cf849
feat :: ํผ๋ธ”๋ฆฌ์‹ฑ
KANGYONGSU23 Nov 25, 2023
5a8bc51
fix :: z-index ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 25, 2023
8588c96
feat :: "์ง€์›ํ•œ ๊ธฐ์—…์ด ์—†์–ด์š”"
KANGYONGSU23 Nov 25, 2023
36fc1f6
fix :: ์ฝ”๋ฉ˜ํŠธ ๋ฐ˜์˜
KANGYONGSU23 Nov 25, 2023
9aae2f0
fix :: ์ฃผ์„์ฒ˜๋ฆฌ
KANGYONGSU23 Nov 25, 2023
f7325b8
fix :: ์ด๋„˜ ์ˆ˜์ •
KANGYONGSU23 Nov 25, 2023
4e30d48
file :: kebabItems ํŒŒ์ผ๋ถ„๋ฆฌ
KANGYONGSU23 Nov 25, 2023
7be24af
fix :: nullish ์ ์šฉ
KANGYONGSU23 Nov 25, 2023
4f2db7b
feat :: ํ•„ํ„ฐ๊ฐ€ ์ ์šฉ ๋์„ ๋•Œ๋งŒ querystring ์ ์šฉ
KANGYONGSU23 Nov 26, 2023
d4d5565
feat :: useQueryString ์ œ๋„ค๋ฆญํƒ€์ž… ์ ์šฉ
KANGYONGSU23 Nov 26, 2023
e653fce
feat :: ๊ธฐ์—…ํŽ˜์ด์ง€ useQueryString ์ ์šฉ
KANGYONGSU23 Nov 26, 2023
d74a5f5
feat :: ๊ฒจ์šธ์ธํ„ด ํ•„ํ„ฐ ์ ์šฉ
KANGYONGSU23 Nov 26, 2023
14cc1b9
feat :: ๋ชจ์ง‘์˜๋ขฐ ํ…Œ์ด๋ธ” ์• ๋‹ˆ๋ฉ”์ด์…˜ ์ ์šฉ
KANGYONGSU23 Nov 26, 2023
4a8397d
Merge branch 'feature/TableAnimation' into develop
Nov 26, 2023
74e0f9c
fix :: ๊ธฐ์—… ๋ฆฌ์ŠคํŠธ ํŽ˜์ด์ง€์— ๋งˆ์ง„ ๋ฐ”ํ…€ ์ถ”๊ฐ€
KANGYONGSU23 Nov 26, 2023
9a46df6
Merge pull request #29 from Team-return/feature/Intern
KANGYONGSU23 Nov 27, 2023
b049e09
fix :: Loading ์• ๋‹ˆ๋ฉ”์ด์…˜ ์˜คํƒ€์ˆ˜์ •
KANGYONGSU23 Nov 27, 2023
5b8a844
fix :: APIํ•จ์ˆ˜ ์ด๋ฆ„ -> ์นด๋ฉœ์ผ€์ด์Šค๋กœ ํ†ต์ผ
KANGYONGSU23 Nov 27, 2023
b1ca416
fix :: ๋ˆ„๋ฝ๋œ apiํ•จ์ˆ˜๋ช… ์ˆ˜์ •
KANGYONGSU23 Nov 27, 2023
30af9c0
delete :: ์ฃผ์„์ œ๊ฑฐ
KANGYONGSU23 Nov 27, 2023
b789bcd
fix :: ์ฝ”๋ฉ˜ํŠธ ๋ฐ˜์˜
KANGYONGSU23 Nov 27, 2023
40e81f7
Merge branch 'develop' into feature/Apply
Nov 28, 2023
425035b
fix :: conflict ํ•ด๊ฒฐ
KANGYONGSU23 Nov 28, 2023
7b06338
fix :: import ์ˆ˜์ •
KANGYONGSU23 Nov 28, 2023
e2d20be
fix :: build ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
KANGYONGSU23 Nov 28, 2023
3fc467e
๐Ÿ”€ :: ์ง€์›ํ•˜๊ธฐ
KANGYONGSU23 Nov 28, 2023
c4c8cba
Merge branch 'develop' into feature/MyPage
Nov 28, 2023
81780f4
fix :: apiํ•จ์ˆ˜๋ช… ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 28, 2023
c2ca788
fix :: conflict ํ•ด๊ฒฐ
KANGYONGSU23 Nov 28, 2023
82a2e66
๐Ÿ”€ :: ๋งˆ์ดํŽ˜์ด์ง€
KANGYONGSU23 Nov 28, 2023
7486320
fix :: ๋ฉ”์ธ์— ๋จธ์ง€ํ•˜๊ธฐ ์ „ ๋งˆ๋ฌด๋ฆฌ ์ž‘์—…
Nov 28, 2023
cbd5623
fix :: ์—๋Ÿฌ ํ•ธ๋“ค๋ง
KANGYONGSU23 Nov 28, 2023
6c54228
feat :: ๋ถ๋งˆํฌ ์กฐํšŒ ๊ฐœ์„ 
KANGYONGSU23 Nov 28, 2023
d319daf
update :: ๋””์ž์ธ์‹œ์Šคํ…œ ์—…๋ฐ์ดํŠธ
KANGYONGSU23 Nov 28, 2023
a96828d
feat :: banner ์•„์ดํ…œ ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 28, 2023
9f7650a
fix :: ์ด๋ฏธ์ง€ ํ™•์žฅ์ž ๋ณ€๊ฒฝ
KANGYONGSU23 Nov 28, 2023
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
Prev Previous commit
Next Next commit
fix :: ์ฝ”๋ฉ˜ํŠธ ๋ฐ˜์˜
KANGYONGSU23 committed Nov 27, 2023
commit b789bcd05eee0774b8a628b397a459e932c93759
4 changes: 2 additions & 2 deletions src/components/company/CompanyTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { GetCompanyKebabItems } from "@/util/object/kebabMenuItems";
import { getCompanyKebabItems } from "@/util/object/kebabMenuItems";
import { KebabItemType } from "@/util/type/kebabMenu";
import Image from "next/image";
import KebabMenu from "../common/Dropdown/KebabMenu";
@@ -22,7 +22,7 @@ export default function CompanyTitle({
onClickInterview,
children,
}: PropsType) {
const kebabItems = GetCompanyKebabItems(
const kebabItems = getCompanyKebabItems(
onClickRecruitments,
onClickInterview
);
4 changes: 2 additions & 2 deletions src/components/mypage/DetailProfile.tsx
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

import { MyProfile } from "@/apis/students";
import { departmentEnum } from "@/util/object/enum";
import { mypageKebabItems } from "@/util/object/kebabMenuItems";
import { getMypageKebabItems } from "@/util/object/kebabMenuItems";
import Image from "next/image";
import KebabMenu from "../common/Dropdown/KebabMenu";
import GhostTag from "./GhostTag";
@@ -33,7 +33,7 @@ export default function DetailProfile() {
{profile && departmentEnum[profile.department]}
</p>
</div>
<KebabMenu items={mypageKebabItems} />
<KebabMenu items={getMypageKebabItems()} />
</div>
);
}
87 changes: 42 additions & 45 deletions src/util/object/kebabMenuItems.ts
Original file line number Diff line number Diff line change
@@ -3,56 +3,53 @@ import { useRouter } from "next/navigation";
import { Cookies } from "react-cookie";
import { KebabItemType } from "../type/kebabMenu";

export const mypageKebabItems: KebabItemType[] = [
{
label: "ํ”„๋กœํ•„ ์ˆ˜์ •",
onClick: () => {
const { append } = useToastStore();
append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
export const getMypageKebabItems = (): KebabItemType[] => {
const { append } = useToastStore();
const navigator = useRouter();
const cookies = new Cookies();
return [
{
label: "ํ”„๋กœํ•„ ์ˆ˜์ •",
onClick: () => {
append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
},
},
},
{
label: "๋น„๋ฐ€๋ณ€ํ˜ธ ๋ณ€๊ฒฝ",
onClick: () => {
const { append } = useToastStore();

append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
{
label: "๋น„๋ฐ€๋ณ€ํ˜ธ ๋ณ€๊ฒฝ",
onClick: () => {
append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
},
},
},
{
label: "๋ฒ„๊ทธ ์ œ๋ณดํ•˜๊ธฐ",
onClick: () => {
const { append } = useToastStore();

append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
{
label: "๋ฒ„๊ทธ ์ œ๋ณดํ•˜๊ธฐ",
onClick: () => {
append({
title: "",
message: "๊ฐœ๋ฐœ ์ค‘์ธ ๊ธฐ๋Šฅ์ž…๋‹ˆ๋‹ค.",
type: "YELLOW",
});
},
},
},
{
label: "๋กœ๊ทธ์•„์›ƒ",
onClick: () => {
const navigator = useRouter();
const cookies = new Cookies();

navigator.push("/account/login");
cookies.remove("access_token");
cookies.remove("refresh_token");
{
label: "๋กœ๊ทธ์•„์›ƒ",
onClick: () => {
navigator.push("/account/login");
cookies.remove("access_token");
cookies.remove("refresh_token");
},
},
},
];
];
};

export const GetCompanyKebabItems = (
export const getCompanyKebabItems = (
onClickRecruitments?: () => void,
onClickInterview?: () => void
): KebabItemType[] => {