diff --git a/relanz/community/views.py b/relanz/community/views.py index 66813bc..e3441cf 100644 --- a/relanz/community/views.py +++ b/relanz/community/views.py @@ -112,6 +112,7 @@ def new(request, challenge_id): res_data = {'form':form, 'challenge':challenge} return render(request, 'community/new.html', res_data) + @login_required(login_url='/user/signin') @email_verified_required def detail(request, challenge_id, article_id): @@ -119,8 +120,12 @@ def detail(request, challenge_id, article_id): article = get_object_or_404(Article, pk=article_id) articles = Article.objects.filter(challenge=challenge).order_by('-created_at') participant = Participant.objects.filter(challenge_id=challenge_id) - + paginator = Paginator(articles, 1) + for article_ in articles: + for i in range(1, paginator.num_pages+1): + if paginator.get_page(i)[0].id == article_.id: + article_num = i try: page_number = request.GET.get('page') print(page_number) diff --git a/relanz/static/css/challenge.css b/relanz/static/css/challenge.css index 443b4a0..acd2f6d 100644 --- a/relanz/static/css/challenge.css +++ b/relanz/static/css/challenge.css @@ -485,4 +485,21 @@ font-weight: 700; line-height: 145.023%; letter-spacing: -1px; +} + + +.content > p::before { + content: "•"; /* 원하는 리스트 마커를 설정합니다. */ + display: inline-block; + width: 1em; + margin-right: 0.5em; /* 마커와 텍스트 사이의 간격을 조정합니다. */ + } + .content > p { + display: flex; + } + +.new-p { + display: flex; + flex-direction: column; + gap: 10px; } \ No newline at end of file diff --git a/relanz/static/css/detail.css b/relanz/static/css/detail.css index 9bc5944..6945ce4 100644 --- a/relanz/static/css/detail.css +++ b/relanz/static/css/detail.css @@ -349,7 +349,7 @@ position: absolute; z-index: 100; min-height: 390px; - max-height: 390px; + max-height: 430px; width: 100%; top: 70px; @@ -358,12 +358,31 @@ display: flex; justify-content: center; align-items: center; + + flex-wrap: wrap; + overflow: hidden; } .main-image-div > img { - /* object-fit: cover; */ - object-fit: contain; - max-width: 430px; - max-height: 430px; + /* object-fit: cover; */ + + object-fit: contain; + max-width: 430px; + max-height: 430px; */ + + /* position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + width: auto; + height: auto; + max-width: 100%; + max-height: 100%; + margin: auto; */ + + display:block; + width:100%; + height:auto; } .rest-image-bundle-div { diff --git a/relanz/static/css/user/user_delete.css b/relanz/static/css/user/user_delete.css index e6db4b0..4017a71 100644 --- a/relanz/static/css/user/user_delete.css +++ b/relanz/static/css/user/user_delete.css @@ -292,4 +292,7 @@ .for-padding { height: 100px; +} +#real_submit_btn { + visibility: hidden; } \ No newline at end of file diff --git a/relanz/static/js/challenge.js b/relanz/static/js/challenge.js index 9e57904..34528e8 100644 --- a/relanz/static/js/challenge.js +++ b/relanz/static/js/challenge.js @@ -1 +1,27 @@ -document.getElementById(`${color}_${num}`).src = `` \ No newline at end of file +// document.getElementById(`${color}_${num}`).src = `` + + +const contentDiv_1 = document.getElementById("linebreaks_fix_1"); +const contentDiv_2 = document.getElementById("linebreaks_fix_2"); + +const paragraphs_1 = contentDiv_1.innerHTML.split("
"); +const paragraphs_2 = contentDiv_2.innerHTML.split("
"); +contentDiv_1.innerHTML = ""; +contentDiv_2.innerHTML = ""; + +window.addEventListener('DOMContentLoaded',function() { + const newDiv = paragraphs_1.filter(word => word !== '') + newDiv.forEach((paragraph) => { + const p = document.createElement("p"); + p.innerHTML = paragraph; + contentDiv_1.appendChild(p); + }); + + const newDi = paragraphs_2.filter(word => word !== '') + newDi.forEach((paragraph) => { + const p = document.createElement("p"); + p.innerHTML = paragraph; + contentDiv_2.appendChild(p); + }); +}) + diff --git a/relanz/static/js/communityHome.js b/relanz/static/js/communityHome.js index 76001e2..3fb6507 100644 --- a/relanz/static/js/communityHome.js +++ b/relanz/static/js/communityHome.js @@ -28,6 +28,7 @@ async function makeRequest(url) { pk: element.pk, } }); + console.log(resultData) return resultData; } catch (error) { @@ -90,7 +91,6 @@ async function handleIntersection(entries, observer) { for (let entry of entries) { if (entry.isIntersecting) { const listUrl = await getUrl(); - console.log(listUrl) makeImageDiv(listUrl); observer.unobserve(entry.target); } diff --git a/relanz/templates/challenge/challenge.html b/relanz/templates/challenge/challenge.html index 7427792..29aa37d 100644 --- a/relanz/templates/challenge/challenge.html +++ b/relanz/templates/challenge/challenge.html @@ -54,11 +54,11 @@
해소효과
-
{{challenge.effect|linebreaksbr}}
+
{{challenge.effect|linebreaksbr}}
이런 사람에게 추천해요!
-
{{challenge.recommand|linebreaksbr}}
+
{{challenge.recommand|linebreaksbr}}
{% comment %} 여기가 장소라 if 템플릿 사용하면 되용! {% endcomment %}
diff --git a/relanz/templates/tag/tagsurvey.html b/relanz/templates/tag/tagsurvey.html index c00c031..5969b93 100644 --- a/relanz/templates/tag/tagsurvey.html +++ b/relanz/templates/tag/tagsurvey.html @@ -12,7 +12,7 @@
체크리스트 결과가 반영되었어요!
-
캄크루즈님은 주로
어떤 방식으로 스트레스를 푸시나요?
+
{{user.nickname}}님은 주로
어떤 방식으로 스트레스를 푸시나요?
(중복 가능)