Skip to content

Commit

Permalink
Merge pull request #17 from 2023-AHEUNGTHON/feature/#12-api-연동-작업
Browse files Browse the repository at this point in the history
feat: 일부 요소 수정
  • Loading branch information
haesol822 authored Nov 26, 2023
2 parents 1d08594 + f17e8a3 commit 6121e75
Show file tree
Hide file tree
Showing 3 changed files with 124 additions and 124 deletions.
2 changes: 1 addition & 1 deletion src/apis/emailCheck.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import axios from "axios";
import axios from "../apis/axios";

export const emailCheck = (formData, setFormData, setIsEmailAvailable) => {

Expand Down
2 changes: 1 addition & 1 deletion src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ ReactDOM.createRoot(document.getElementById("root")).render(
</React.StrictMode>
);

axios.defaults.baseURL = "http://ec2-13-209-10-74.ap-northeast-2.compute.amazonaws.com:8080";
axios.defaults.baseURL = "http://ec2-54-180-133-112.ap-northeast-2.compute.amazonaws.com:8080";
axios.defaults.withCredentials = true;
244 changes: 122 additions & 122 deletions src/pages/CompletePostBox/style.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,139 +103,139 @@ export const Ornaments = styled.img`
/* transform: rotate(20deg); */
`;

export const StyleBox = styled.div`
position: fixed;
z-index: 3;
bottom: 0;
width: 100%;
background-color: white;
animation: ${slideIn} 0.5s ease-in-out;
max-width: 430px;
height: 310px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: flex-start;
border-radius: 1.5rem 1.5rem 0rem 0rem;
hr {
width: 22.125rem;
height: 1px;
background: rgba(0, 0, 0, 0.25);
}
`;
// export const StyleBox = styled.div`
// position: fixed;
// z-index: 3;
// bottom: 0;
// width: 100%;
// background-color: white;
// animation: ${slideIn} 0.5s ease-in-out;
// max-width: 430px;
// height: 310px;
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: flex-start;
// border-radius: 1.5rem 1.5rem 0rem 0rem;
// hr {
// width: 22.125rem;
// height: 1px;
// background: rgba(0, 0, 0, 0.25);
// }
// `;

export const MenuWrapper = styled.div`
width: 72%;
height: 48px;
background-color: transparent;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
margin: 8px auto;
`;
// export const MenuWrapper = styled.div`
// width: 72%;
// height: 48px;
// background-color: transparent;
// display: flex;
// flex-direction: row;
// align-items: center;
// justify-content: space-between;
// margin: 8px auto;
// `;

export const LineVertical = styled.div`
border-left: 1px solid rgba(0, 0, 0, 0.25);
height: 43px;
`;
// export const LineVertical = styled.div`
// border-left: 1px solid rgba(0, 0, 0, 0.25);
// height: 43px;
// `;

export const LineHorizontal = styled.div`
border-top: 1px solid rgba(0, 0, 0, 0.25);
width: 90%;
`;
// export const LineHorizontal = styled.div`
// border-top: 1px solid rgba(0, 0, 0, 0.25);
// width: 90%;
// `;

export const MenuBtn = styled.button`
width: 48px;
height: 48px;
img {
width: 48px;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
`;
// export const MenuBtn = styled.button`
// width: 48px;
// height: 48px;
// img {
// width: 48px;
// height: auto;
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: center;
// }
// `;

export const ShapeContainer = styled.div`
width: 84%;
height: 318px;
display: grid;
grid-template-columns: repeat(3, 103px);
grid-template-rows: 103px 103px;
column-gap: 16px;
row-gap: 12px;
margin-top: 12px;
place-items: center;
:active {
border: 3px solid #FF9466;
border-radius: 1rem;
}
`;
// export const ShapeContainer = styled.div`
// width: 84%;
// height: 318px;
// display: grid;
// grid-template-columns: repeat(3, 103px);
// grid-template-rows: 103px 103px;
// column-gap: 16px;
// row-gap: 12px;
// margin-top: 12px;
// place-items: center;
// :active {
// border: 3px solid #FF9466;
// border-radius: 1rem;
// }
// `;

export const IconWrapper = styled.button`
width: 103px;
height: 103px;
background-color: #FFEBAD;
display: flex;
border-radius: 1rem;
flex-direction: column;
align-items: center;
justify-content: flex-end;
:active {
border: none;
border-radius: 0;
}
`;
// export const IconWrapper = styled.button`
// width: 103px;
// height: 103px;
// background-color: #FFEBAD;
// display: flex;
// border-radius: 1rem;
// flex-direction: column;
// align-items: center;
// justify-content: flex-end;
// :active {
// border: none;
// border-radius: 0;
// }
// `;

export const ShapeIcon = styled.img`
width: 64px;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
`;
// export const ShapeIcon = styled.img`
// width: 64px;
// height: auto;
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: center;
// `;

export const ColorContainer = styled.div`
width: 84%;
height: 318px;
display: grid;
grid-template-columns: repeat(5, 1fr);
grid-template-rows: repeat(3, 56px);
row-gap: 20px;
margin-top: 12px;
align-items: center;
justify-items: center;
`;
// export const ColorContainer = styled.div`
// width: 84%;
// height: 318px;
// display: grid;
// grid-template-columns: repeat(5, 1fr);
// grid-template-rows: repeat(3, 56px);
// row-gap: 20px;
// margin-top: 12px;
// align-items: center;
// justify-items: center;
// `;

export const OrnaContainer = styled(ShapeContainer)`
place-items: center;
`;
// export const OrnaContainer = styled(ShapeContainer)`
// place-items: center;
// `;

export const ColorBtn = styled.button`
width: 48px;
height: 48px;
border-radius: 50px;
background-color: ${(props) => props.backgroundColor || '#FFFFFF'};
border: ${(props => props.border || '0.539px solid rgba(0, 0, 0, 0.33)')};
/* :active {
width: 50px;
height: 50px;
border: 3px solid #FF9466;
border-radius: 1rem;
} */
`;
// export const ColorBtn = styled.button`
// width: 48px;
// height: 48px;
// border-radius: 50px;
// background-color: ${(props) => props.backgroundColor || '#FFFFFF'};
// border: ${(props => props.border || '0.539px solid rgba(0, 0, 0, 0.33)')};
// /* :active {
// width: 50px;
// height: 50px;
// border: 3px solid #FF9466;
// border-radius: 1rem;
// } */
// `;

export const OrnaIcon = styled(ShapeIcon)`
width: 100px;
height: 100px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
`;
// export const OrnaIcon = styled(ShapeIcon)`
// width: 100px;
// height: 100px;
// display: flex;
// flex-direction: column;
// align-items: center;
// justify-content: center;
// `;

export const ButtonWrapper = styled.div`
display: flex;
Expand Down

0 comments on commit 6121e75

Please sign in to comment.