Skip to content

Commit

Permalink
fix: change button prop
Browse files Browse the repository at this point in the history
  • Loading branch information
kang-kibong committed Oct 24, 2024
1 parent ec1d9a6 commit 1bdf9eb
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VITE_BASE_URL=http://localhost:5173
VITE_BASE_URL=/
VITE_GOOGLE_AUTH_CLIENT_ID=268837811477-28b8i24r1sb0aroltho84ia6jecj74h7.apps.googleusercontent.com
VITE_GOOGLE_AUTH_REDIRECT_URI=http://localhost:5173/loading
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
},
"lint-staged": {
"**/*.{tsx,ts,jsx,js}": [
"bash -c tsc -p tsconfig.json --noEmit",
"eslint --fix --cache",
"prettier --write --cache"
]
Expand Down
8 changes: 4 additions & 4 deletions src/apis/employee/hooks/useGetMyApplication.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { APIPath } from '@/apis/apiPath';
import { BASE_URL, fetchInstanceWithAuth } from '@/apis/instance';
import { clientInstance } from '@/apis/instance';
import { useQuery } from '@tanstack/react-query';

export const getMyApplicationPath = () => `${BASE_URL}${APIPath.allApplication}`;
export const getMyApplicationPath = () => `${APIPath.allApplication}`;

const myApplicationQueryKey = [getMyApplicationPath()];

export const getMyApplication = async () => {
const token = localStorage.getItem('token') ?? '';
const response = await fetchInstanceWithAuth(token).get(getMyApplicationPath());
const response = await clientInstance.get(getMyApplicationPath());
return response.data;
};

Expand Down
7 changes: 3 additions & 4 deletions src/apis/employer/hooks/usePostNotice.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { APIPath } from '@/apis/apiPath';
import { BASE_URL, fetchInstanceWithAuth } from '@/apis/instance';
import { clientInstance } from '@/apis/instance';
import { useMutation } from '@tanstack/react-query';

export type NoticeRequestData = {
Expand All @@ -19,11 +19,10 @@ export type NoticeRequestData = {
companyName?: string;
};

export const getPostNoticePath = () => `${BASE_URL}${APIPath.postNotice}`;
export const getPostNoticePath = () => `${APIPath.postNotice}`;

export const postNotice = async (req: NoticeRequestData) => {
const token = localStorage.getItem('token') ?? '';
const response = await fetchInstanceWithAuth(token).post(getPostNoticePath(), req);
const response = await clientInstance.post(getPostNoticePath(), req);
return response.data;
};

Expand Down
2 changes: 1 addition & 1 deletion src/features/auth/SignIn/components/SignInButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export function SignInButton() {
const { redirectToGoogleLogin } = useGoogleOAuth();

return (
<Button theme="outlined" onClick={redirectToGoogleLogin}>
<Button design="outlined" onClick={redirectToGoogleLogin}>
<Flex alignItems="center" gap={FLEX_GAP_CONFIG}>
<Icon.Social.Google />
<Typo size="14px" color="gray" element="span" style={BUTTON_STYLE}>
Expand Down
4 changes: 2 additions & 2 deletions src/features/auth/SignUp/components/common/RoleModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ export default function RoleModal({ content, onSubmit, onClose }: Props) {
}
buttonChildren={
<Flex gap={FLEX_GAP_CONFIG}>
<Button theme="default" onClick={() => onSubmit()}>
<Button design="default" onClick={() => onSubmit()}>
등록할게요
</Button>
<Button theme="outlined" onClick={() => onClose()}>
<Button design="outlined" onClick={() => onClose()}>
괜찮아요
</Button>
</Flex>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function CompaniesTable({ companyList }: Props) {
brand={company.brand}
revenuePerYear={company.revenuePerYear}
/>
<Button theme="textbutton">
<Button design="textbutton">
<Icon.Arrow.BigRightBlue />
</Button>
</Flex>
Expand Down
2 changes: 1 addition & 1 deletion src/features/home/components/Employer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function Employer() {
<Typo element="h1" size="48px" color="white" bold style={headerStyle}>
{`사장님,\n 공고 등록은 하셨나요? 🤔`}
</Typo>
<Button theme="textbutton">등록하러 가기</Button>
<Button design="textbutton">등록하러 가기</Button>
</Flex>
</Banner>
);
Expand Down
2 changes: 1 addition & 1 deletion src/features/layout/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function Header({ profileImage }: Props) {
</Flex>
<Nav open={menuOpen}>
<LanguageFilter />
<Button theme="outlined" style={commonButtonStyle}>
<Button design="outlined" style={commonButtonStyle}>
채용공고 등록
</Button>
<Flex justifyContent="center" alignItems="center">
Expand Down
8 changes: 0 additions & 8 deletions src/pages/apply/applyguide/ApplyGuide.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
import ApplyGuide from './ApplyGuide';
import { BrowserRouter } from 'react-router-dom';

const meta: Meta<typeof ApplyGuide> = {
title: 'PAGES/Apply/ApplyGuide',
component: ApplyGuide,
tags: ['autodocs'],
decorators: [
(Story) => (
<BrowserRouter>
<Story />
</BrowserRouter>
),
],
};

export default meta;
Expand Down
8 changes: 3 additions & 5 deletions src/pages/contract/EmployerContract/EmployerContract.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export const EmployerContract = () => {
</Typo>
<ButtonWrapper>
<div>
<Button theme="outlined" style={{ marginRight: '16px' }}>
<Button design="outlined" style={{ marginRight: '16px' }}>
미리보기
</Button>
<>
Expand All @@ -140,12 +140,10 @@ export const EmployerContract = () => {
</>
</div>
<div>
<Button theme="default" style={{ marginRight: '16px' }}>
<Button design="default" style={{ marginRight: '16px' }}>
다운로드
</Button>
<Button theme="default" style={{}}>
제출하기
</Button>
<Button design="default">제출하기</Button>
</div>
</ButtonWrapper>
</Flex>
Expand Down
11 changes: 11 additions & 0 deletions src/types/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,14 @@ export type MyRecruitListProps = {
image: string;
state: StateProps;
};

export type RecruitmentItem = {
recruitmentId: number;
image: string;
koreanTitle: string;
vietnameseTitle: string;
companyName: string;
salary: number;
workHours: string;
area: string;
};

0 comments on commit 1bdf9eb

Please sign in to comment.