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

refactor: 폴더 구조 변경 및 footer 다크모드 반영 #43

Merged
merged 1 commit into from
May 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion css/detail.css → css/page/detail.css
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@

.video-detail .text-box .share-button .icon {
display: block;
mask: url(../img/detail/element-icon-share.svg);
mask: url(../../img/detail/element-icon-share.svg);
width: 30px;
height: 30px;
background: var(--main-color0);
Expand Down
40 changes: 24 additions & 16 deletions css/footer.css → css/page/footer.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.footer {
border-top: 1px solid #2f2f2f;
border-top: 1px solid var(--main-color5);
min-width: 1240px;
overflow: hidden;
box-sizing: border-box;
}

.footer-notice {
border-bottom: 1px solid #2f2f2f;
border-bottom: 1px solid var(--main-color5);
}
.footer-notice-inner {
width: 1240px;
Expand All @@ -26,16 +26,16 @@
position: absolute;
top: 0;
right: 54px;
border-left: 1px solid #2f2f2f;
border-left: 1px solid var(--main-color5);
height: 50px;
z-index: 200;
}
.footer-notice-inner .next-btn {
position: absolute;
top: 0;
right: 0;
border-right: 1px solid #2f2f2f;
border-left: 1px solid #2f2f2f;
border-right: 1px solid var(--main-color5);
border-left: 1px solid var(--main-color5);
height: 50px;
z-index: 200;
}
Expand Down Expand Up @@ -65,7 +65,7 @@
transition-duration: 300ms;
}
.footer-swiper-container li {
font-weight: 500;
font-weight: 400;
font-size: 17px;
color: #a5a5a5;
}
Expand Down Expand Up @@ -144,18 +144,22 @@ a:visited {
display: flex;
right: 0;
top: 20px;
height: 40px;
font-size: 0;
}

.footer-wavveon .logo {
width: 94px;
height: 38px;
margin-right: 1px;
font-size: 0;
line-height: 38px;
text-align: center;
background-color: #252525;
background: var(--main-color6);
}

.footer-wavveon .logo-img {
width: 94px;
height: 38px;
display: block;
mask: url(../../img/common/ico-footer-wavve.svg);
mask-size: 94px;
background: var(--main-color0);
}
.footer-wavveon select {
display: inline-block;
Expand All @@ -165,10 +169,9 @@ a:visited {
padding-left: 13px;
margin-right: 10px;
line-height: 32px;
color: #a5a5a5;
border: 1px solid #252525;
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADfSURBVDhPYxgFo4AKICMjowyIpaFcnCA3N1cGpBbKhQMmKA0H////vwTE59LT07WgQhgAJPfr16+zILVQIThghtJwcPbs2TsmJiZPgczFxsbGa4D8jxAZCEhLS5NjZGQ8AGQWz5w5cwNEFAEwDAQBoCFXgIb+BmqcCjR0OZD/DSQONEwESB1iYmLqBRo2DySGDhihNFYANKAJSHmzsLDYg/h///4FuWw70LBaEB8bwGsgCADDazowrDSBzH9AF98GGpYOkcEOMCIFHUhKSmYDqVdA/A7IzgQLjoIRDRgYAMM3S1P54/NdAAAAAElFTkSuQmCC)
#252525 96% 50% no-repeat;
color: var(--main-color2);
border: 1px solid var(--main-color6);
background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADfSURBVDhPYxgFo4AKICMjowyIpaFcnCA3N1cGpBbKhQMmKA0H////vwTE59LT07WgQhgAJPfr16+zILVQIThghtJwcPbs2TsmJiZPgczFxsbGa4D8jxAZCEhLS5NjZGQ8AGQWz5w5cwNEFAEwDAQBoCFXgIb+BmqcCjR0OZD/DSQONEwESB1iYmLqBRo2DySGDhihNFYANKAJSHmzsLDYg/h///4FuWw70LBaEB8bwGsgCADDazowrDSBzH9AF98GGpYOkcEOMCIFHUhKSmYDqVdA/A7IzgQLjoIRDRgYAMM3S1P54/NdAAAAAElFTkSuQmCC) var(--main-color6) 96% 50% no-repeat;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
Expand Down Expand Up @@ -197,3 +200,8 @@ a:visited {
.ghost-li {
visibility: hidden;
}

.footer-notice-inner h2 a {
font-weight: 500;
color: var(--main-color0);
}
2 changes: 1 addition & 1 deletion css/profile.css → css/page/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ input:-webkit-autofill:focus,
.logo_section a {
width: 108px;
height: 24px;
mask: url(../img/common/ci-wavve.svg) no-repeat center /cover;
mask: url(../../img/common/ci-wavve.svg) no-repeat center /cover;
display: block;
background: var(--main-color0);
}
Expand Down
4 changes: 2 additions & 2 deletions css/review.css → css/page/review.css
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@
display: block;
width: 12px;
height: 12px;
mask: url(../img/detail/star-fill.svg) no-repeat center /12px;
mask: url(../../img/detail/star-fill.svg) no-repeat center /12px;
background-color: var(--yellow-color1);
}

#reviewContainer [class*='star-half'] {
mask-image: url(../img/detail/star-half.svg);
mask-image: url(../../img/detail/star-half.svg);
}

#reviewContainer .section-title {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions img/common/ico-footer-wavve.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 15 additions & 19 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
crossorigin
href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard-dynamic-subset.min.css"
/>
<link rel="stylesheet" href="./css/footer.css" />
<link rel="stylesheet" href="css/page/footer.css" />
<script src="./js/swiper-bundle.min.js"></script>
<script defer src="./js/common.js" type="module"></script>
<script defer src="./js/index.js" type="module"></script>
Expand All @@ -30,7 +30,7 @@
<div class="header-nav">
<nav class="header-nav-menu">
<ul>
<li><a href="./profile.html">내 프로필</a></li>
<li><a href="./page/profile.html">내 프로필</a></li>
<li><a class="not-open-link" href="#">이용권</a></li>
<li><a class="not-open-link" href="#">쿠폰·코인</a></li>
<li><a class="not-open-link" href="#">웨이브온</a></li>
Expand All @@ -40,29 +40,27 @@
</nav>
</div>
<div class="header-section">
<a href="./index.html" class="logo"
><span class="blind">Wavve</span></a
>
<a href="./index.html" class="logo"><span class="blind">Wavve</span></a>
<nav class="header-menu">
<ul>
<li><a href="#" class="on">홈</a></li>
<li>
<a href="#">카테고리</a>
<div class="category">
<ul>
<li><a href="./subpage/top20.html">TOP 20</a></li>
<li><a href="./subpage/nowplaying.html">NOW PLAYING</a></li>
<li><a href="./subpage/upcoming.html">UPCOMING</a></li>
<li><a href="./subpage/popular.html">POPULAR</a></li>
<li><a href="./page/top20.html">TOP 20</a></li>
<li><a href="./page/nowplaying.html">NOW PLAYING</a></li>
<li><a href="./page/upcoming.html">UPCOMING</a></li>
<li><a href="./page/popular.html">POPULAR</a></li>
</ul>
</div>
</li>
<li><a class="not-open-link" href="#">LIVE</a></li>
<li><a href="./profile.html">MY</a></li>
<li><a href="./page/profile.html">MY</a></li>
</ul>
</nav>
<div class="search-container">
<a href="./search.html">
<a href="./page/search.html">
<img src="./img/common/icon-search.svg" alt="검색" />
</a>
</div>
Expand Down Expand Up @@ -90,7 +88,7 @@
<section class="cards-section top-rated">
<div class="cards-section-title">
TOP 20
<a href="./subpage/top20.html" class="more">
<a href="./page/top20.html" class="more">
더보기<img src="./img/main/arrow-more.svg" class="arrow-more" />
</a>
</div>
Expand All @@ -108,7 +106,7 @@
<section class="cards-section playing">
<div class="cards-section-title">
NOW PLAYING
<a href="./subpage/nowplaying.html" class="more">
<a href="./page/nowplaying.html" class="more">
더보기<img src="./img/main/arrow-more.svg" class="arrow-more" />
</a>
</div>
Expand All @@ -126,7 +124,7 @@
<section class="cards-section upcoming">
<div class="cards-section-title">
UPCOMING
<a href="./subpage/upcoming.html" class="more">
<a href="./page/upcoming.html" class="more">
더보기<img src="./img/main/arrow-more.svg" class="arrow-more" />
</a>
</div>
Expand All @@ -144,7 +142,7 @@
<section class="cards-section popular">
<div class="cards-section-title">
POPULAR
<a href="./subpage/popular.html" class="more">
<a href="./page/popular.html" class="more">
더보기<img src="./img/main/arrow-more.svg" class="arrow-more" />
</a>
</div>
Expand Down Expand Up @@ -218,10 +216,8 @@ <h2>
<div class="footer-menu">
<div class="footer-wavveon">
<div class="logo">
<img
src="https://www.wavve.com/img/ico-footer-wavve-on.d4912b54.svg"
alt="Wavve on"
/>
<span class="logo-img"></span>
<span class="blind">wavve on</span>
</div>
<select>
<option value disabled selected hidden>사업자용 웨이브 가입</option>
Expand Down
2 changes: 1 addition & 1 deletion js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const handleSearch = () => {
event.preventDefault();
if (!$searchInput.value) return window.alert('검색어를 입력해주세요');

window.location.href = `./search-result.html?query=${encodeURIComponent($searchInput.value)}`;
window.location.href = `../page/search-result.html?query=${encodeURIComponent($searchInput.value)}`;
});
}

Expand Down
13 changes: 8 additions & 5 deletions js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@ const mainImgSwiper = (movieTypeString) => {
movies.forEach((movie) => {
const slide = document.createElement("div");
slide.className = "swiper-slide";
slide.innerHTML = ` <div class="slide-img-container">
<title class="main-title">${movie.title}</title>
<img src="https://image.tmdb.org/t/p/w1920_and_h800_multi_faces${movie.backdrop_path}" class="big-banner"/>
</div>`;
slide.innerHTML = `
<div class="slide-img-container">
<a href="./page/detail.html?movieId=${movie.id}">
<title class="main-title">${movie.title}</title>
<img src="https://image.tmdb.org/t/p/w1920_and_h800_multi_faces${movie.backdrop_path}" class="big-banner"/>
</a>
</div>`;
swiperWrapper.appendChild(slide);
});

Expand Down Expand Up @@ -65,7 +68,7 @@ const loadMoviesAndDisplay = (movieTypeString) => {
: "";
return `
<li class="card-poster swiper-slide" id=${movie.id}>
<a href="./detail.html?movieId=${movie.id}">
<a href="./page/detail.html?movieId=${movie.id}">
${ratedNumberHtml} <!-- 여기에 순위 이미지 코드를 추가합니다. -->
<div class="card-image-wrap">
<img class="card-img" src="https://image.tmdb.org/t/p/w500${movie.poster_path}" alt="${movie.title}"/>
Expand Down
5 changes: 3 additions & 2 deletions js/detail.js → js/page/detail.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {getMovieDetail} from './api.js';
import getUrlParamValue from "./utils/getUrlParamValue.js";
import {getMovieDetail} from '../api.js';
import getUrlParamValue from "../utils/getUrlParamValue.js";

const movieId = getUrlParamValue('movieId');

Expand Down Expand Up @@ -119,6 +119,7 @@ shareButton.addEventListener('click', function() {
});
});


const removeLoadingOverlay = () => {
const loadingOverlay = document.querySelector('#loaderWrap');

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const writeReviewHandler = () => {

if (!username) {
window.alert('먼저 프로필을 설정하신 뒤에 작성해주세요');
window.location.href = './profile.html';
window.location.href = '../../../../page/profile.html';
return;
}

Expand Down
4 changes: 2 additions & 2 deletions js/review/utils.js → js/page/review/utils.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import getUrlParamValue from "../utils/getUrlParamValue.js";
import {getLocalStorage, setLocalStorage} from "../utils/localStorage.js";
import getUrlParamValue from "../../utils/getUrlParamValue.js";
import {getLocalStorage, setLocalStorage} from "../../utils/localStorage.js";

const LOCALSTORAGE_COMMENTS = 'comments';
const LOCALSTORAGE_USER_INFO = 'userObj';
Expand Down
6 changes: 3 additions & 3 deletions js/searchList.js → js/page/searchList.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import getUrlParamValue from "./utils/getUrlParamValue.js";
import {getMovieWithKeywords} from "./api.js";
import getUrlParamValue from "../utils/getUrlParamValue.js";
import {getMovieWithKeywords} from "../api.js";

const $searchResultSection = document.querySelector('#searchResultSection');

Expand All @@ -11,7 +11,7 @@ getMovieWithKeywords(searchKeyword).then(({results}) => {
const $div = document.createElement('div');
$div.className = 'no-result-box';
$div.innerHTML = `
<img src="./img/common/icon-alert.svg" alt="" />
<img src="../img/common/icon-alert.svg" alt="" />
<p class="search-empty-text">
'<span class="error-word">${searchKeywordKor}</span>' 검색결과가 없어요.<br/>다시 한 번 확인해주세요
</p>
Expand Down
2 changes: 1 addition & 1 deletion js/searchMain.js → js/page/searchMain.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {getMovieData} from "./api.js";
import {getMovieData} from "../api.js";

const $container = document.querySelector('#searchMainContainer');

Expand Down
2 changes: 1 addition & 1 deletion js/subpage.js → js/page/subpage.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import renderMovieDisplay from "./renderMovieDisplay.js";
import renderMovieDisplay from "../renderMovieDisplay.js";

const $nowPlayingPage = document.querySelector("#nowPlayingPage");
const $popularPage = document.querySelector("#popularPage");
Expand Down
2 changes: 1 addition & 1 deletion js/renderMovieDisplay.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const renderMovieDisplay = (movieTypeString, selector) => {
const cardsHtml = movies
.map((movie) => {
return `<li class="card-poster">
<a href="../detail.html?movieId=${movie.id}">
<a href="./detail.html?movieId=${movie.id}">
<div class="card-image-wrap"><img class="card-img" src="https://image.tmdb.org/t/p/w500${movie.poster_path}" alt="${movie.title}"/></div>
</a>
</li>`;
Expand Down
Loading