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.

Sign up for GitHub

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

feat: 폰트 import 위치를 헤더가 아닌 index.html에서 진행 #471

Merged
merged 1 commit into from
Mar 12, 2024
Merged

feat: 폰트 import 위치를 헤더가 아닌 index.html에서 진행 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions frontend/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<title>ping pong</title>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/jgthms/minireset.css@master/minireset.min.css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="assets/fonts/font.css"/>
<link rel="stylesheet" href="assets/css/common/header.css"/>
<link rel="stylesheet" href="assets/css/common/body.css"/>
<link rel="stylesheet" href="global.css"/>
Expand Down
11 changes: 5 additions & 6 deletions frontend/src/header/mainHeader/header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ export default function MainHeader($container) {
renderFriendsInfoModal(headerElement);
renderWarningModal(headerElement);


// 뒤로가기 버튼 클릭 이벤트
click(document.getElementById("go-back"), () => {
history.back();
Expand Down Expand Up @@ -206,8 +205,8 @@ export default function MainHeader($container) {
let display = "none";

headerElement.insertAdjacentHTML(
"beforeend",
`
"beforeend",
`
<div id="warning-modal-wrapper" style="display: ${display}; position: fixed; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 70vw; height: 30vh; background: rgba(10, 10, 10, 0.95); border-radius: 3vh; border: 1vh #FBFF3E solid; z-index: 3">
<div style="position: absolute; left: 120px; top: 80px; text-align: center; color: white; font-size: 40px; font-family: Galmuri11, serif; font-weight: 400; word-wrap: break-word;">이미 보냈다.</div>
<!-- left: calc(50% + 25vw - 1vh); : left기준으로 모달이 50% 위치에 우선 있고 모달의 너비는 width: 70vw 이니까 x의 위치를 모달 오른쪽 테두리로부터 10vw 만큼 주고 싶었기에 border : 1vh까지 계산하여 (50% + 25vw - 1vh)를 주었습니다. -->
Expand Down Expand Up @@ -458,7 +457,9 @@ export default function MainHeader($container) {
}).then((response) => {
if (response.status === 200) {
} else if (response.status === 409) {
const warningModal = document.getElementById("warning-modal-wrapper");
const warningModal = document.getElementById(
"warning-modal-wrapper",
);
warningModal.style.display = "flex";
} else {
navigate("/");
Expand All @@ -469,7 +470,6 @@ export default function MainHeader($container) {
});
};

importCss("../../../assets/fonts/font.css");
let [getUserInfo, setUserInfo] = useState({}, this, "render");
let [getFriendsList, setFriendsList] = useState(
{},
Expand All @@ -487,5 +487,4 @@ export default function MainHeader($container) {
"renderSearchedUserList",
);
init();

}
Loading