|
|
@@ -206,6 +206,7 @@
|
|
|
// 게시글 목록 조회
|
|
|
const displayArticles = (articles) => {
|
|
|
articles.forEach(article => {
|
|
|
+ console.log(JSON.stringify(article))
|
|
|
const domParser = new DOMParser();
|
|
|
|
|
|
// 게시글 정보
|
|
|
@@ -230,7 +231,7 @@
|
|
|
</div>
|
|
|
`;
|
|
|
const divArticleMeta = domParser.parseFromString(domStrArticleMeta, 'text/html').body.firstChild;
|
|
|
- divArticleMeta.querySelector('.date').textContent = new Date(article.create).toLocaleString();
|
|
|
+ divArticleMeta.querySelector('.date').textContent = new Date(article.created).toLocaleString();
|
|
|
|
|
|
// 게시글 좋아요한 경우 active
|
|
|
if (article.favorite) {
|
|
|
@@ -320,7 +321,13 @@
|
|
|
targetFeed = document.querySelector('.nav-item.active');
|
|
|
loadingArticles = window.document.querySelector('#article-loading');
|
|
|
articleList = document.querySelector('#article-list');
|
|
|
-
|
|
|
+
|
|
|
+ const followString = document.querySelector('.follow-btn');
|
|
|
+ if("${isFollow}" === "true"){
|
|
|
+ followString.classList.add('active');
|
|
|
+ followString.querySelector('.follow').textContent = unfollow;
|
|
|
+ }
|
|
|
+
|
|
|
setLoading('on');
|
|
|
// fetch api call
|
|
|
fetch(url, options)
|
|
|
@@ -338,12 +345,6 @@
|
|
|
noContent();
|
|
|
}, 1000);
|
|
|
});
|
|
|
-
|
|
|
- const followString = document.querySelector('.follow-btn');
|
|
|
- if(followString.classList.contains('active')) {
|
|
|
- followString.querySelector('.follow').textContent = unfollow;
|
|
|
- }
|
|
|
-
|
|
|
}
|
|
|
|
|
|
</script>
|
|
|
@@ -351,11 +352,8 @@
|
|
|
|
|
|
<body>
|
|
|
<jsp:include page="/WEB-INF/jsp/include/header.jsp"></jsp:include>
|
|
|
- <!-- user-page content -->
|
|
|
-
|
|
|
- ${user}
|
|
|
-
|
|
|
|
|
|
+ <!-- user-page content -->
|
|
|
<div class="user-page">
|
|
|
<!-- User Info -->
|
|
|
<section class="user-info">
|
|
|
@@ -364,20 +362,24 @@
|
|
|
<div class="col-10">
|
|
|
<img src="/resources/images/avatar.png" alt="" class="user-img">
|
|
|
<h4 class="user-name"><c:out value="${user.username}"></c:out></h4>
|
|
|
- <p class="profile-bio"><c:out value="${user.shortBio}"></c:out></p>
|
|
|
- <c:choose>
|
|
|
- <c:when test="${user.id eq ssId}">
|
|
|
- <a href="/user/settings/${user.id}" class="action-btn btn-sm">
|
|
|
- <i class="fas fa-cog"></i> Edit Profile Settings
|
|
|
- </a>
|
|
|
- </c:when>
|
|
|
- <c:otherwise>
|
|
|
- <button class="action-btn btn-sm follow-btn" onclick="userFollow()">
|
|
|
- <i class="fas fa-plus"></i>
|
|
|
- <span class="follow"> Follow <c:out value="${user.username}"/></span>
|
|
|
- </button>
|
|
|
- </c:otherwise>
|
|
|
- </c:choose>
|
|
|
+ <p class="profile-bio">
|
|
|
+ <pre>
|
|
|
+ <c:out value="${user.shortBio}"></c:out>
|
|
|
+ </pre>
|
|
|
+ </p>
|
|
|
+ <c:choose>
|
|
|
+ <c:when test="${user.id eq ssId}">
|
|
|
+ <a href="/user/settings/${user.id}" class="action-btn btn-sm">
|
|
|
+ <i class="fas fa-cog"></i> Edit Profile Settings
|
|
|
+ </a>
|
|
|
+ </c:when>
|
|
|
+ <c:otherwise>
|
|
|
+ <button class="action-btn btn-sm follow-btn" onclick="userFollow()">
|
|
|
+ <i class="fas fa-plus"></i>
|
|
|
+ <span class="follow"> Follow <c:out value="${user.username}"/></span>
|
|
|
+ </button>
|
|
|
+ </c:otherwise>
|
|
|
+ </c:choose>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -406,8 +408,7 @@
|
|
|
</article>
|
|
|
|
|
|
<!-- Article List -->
|
|
|
- <div id="article-list" style="display: block;">
|
|
|
- </div>
|
|
|
+ <div id="article-list" style="display: block;"></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
