Skip to content

Commit

Permalink
Merge pull request #47 from Andrevile/feature/#28-PersonalProfile
Browse files Browse the repository at this point in the history
Feature/#28 personal profile
  • Loading branch information
Andrevile authored May 6, 2022
2 parents 6d9b19d + d3b3354 commit 24707bf
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 2 deletions.
1 change: 1 addition & 0 deletions apis/users.api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type { UserRegisterInfoType } from 'recoil/auth';
import { UserEditForm } from 'types/user';
import type { CustomAxiosRequestConfig } from './type';
class UsersAPI extends BaseAPI {
//https://apibora.shop/api/users/
checkUserName(params: unknown) {
return this.get('/check_nickname', { params });
}
Expand Down
4 changes: 4 additions & 0 deletions components/common/Atomic/Tabs/Button/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ export const DefaultButton = styled.button<{ bgColor?: boolean }>`
}
`;

export const UploadButton = styled(DefaultButton)`
height: 48px;
`;

export const ProfileEditButton = styled(DefaultButton)`
padding: 10px 24px 10px 20px;
`;
Expand Down
2 changes: 1 addition & 1 deletion components/initialRegister/Button/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import * as S from './Button.style';
import * as S from './styles';

export interface ButtonPropsType {
sort: string;
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion hooks/useImageHandle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import AWS from 'aws-sdk';

import { useRecoilState } from 'recoil';
import { userRegisterInfoState } from 'recoil/auth';
import type { UserRegisterInfoType } from 'recoil/auth';
import { ConfigurationServicePlaceholders } from 'aws-sdk/lib/config_service_placeholders';

const useImageHandle = (name: string) => {
Expand Down
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pages/profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { numberWithCommas } from 'utils/numberWithCommas';
import { Keyword } from 'components/common/Atomic/Tabs/Keyword';
import ProfileEdit from 'components/Profile/ProfileEdit';
import UploadProduct from 'components/Profile/UploadProduct';
import { UploadButton } from 'components/common/Atomic/Tabs/Button';

const Profile: React.FC = () => {
const queryClient = useQueryClient();
Expand Down Expand Up @@ -153,6 +154,7 @@ const Profile: React.FC = () => {
<InfoAside>
<ProfileEdit editMode={editMode} editModeOnOff={editModeOnOff} />
{!editMode && <UploadProduct />}
<UploadButton />
</InfoAside>
</InfoWrapper>
<div style={{ marginBottom: '40px' }}>
Expand Down

0 comments on commit 24707bf

Please sign in to comment.